Newer EFL if someone is interested - just RFC now

index 27dd2eb..c1e564f 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "70490"
+EFL_SRCREV ?= "74035"
 
 ARM_INSTRUCTION_SET = "arm"

index 8c9a0df..4a77de3 100644
@@ -11,7 +11,3 @@ inherit efl
 AUTO_LIBNAME_PKGS = ""
 
 FILES_${PN} += "${libdir}/eina"
-
-do_install_append() {
-  rmdir ${D}${bindir}
-}

new file mode 100644
index 0000000..a2ce285
@@ -0,0 +1,41 @@
+From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+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 <[email protected]>
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ 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
+

index a2ce285..55773a3 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Martin Jansa <[email protected]>
 ---
- 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);
- 
-    return _ecore_fb_init_count;
-@@ -59,6 +62,7 @@ ecore_fb_shutdown(void)
-    if (--_ecore_fb_init_count != 0)
-       return _ecore_fb_init_count;
- 
+    if (!oldhand)
+      {
+         oldhand = signal(SIGINT, nosigint);
+@@ -77,6 +80,7 @@ ecore_fb_shutdown(void)
+         oldhand = NULL;
+      }
+    
 +   ecore_fb_ts_shutdown();
     ecore_fb_vt_shutdown();
  
     return _ecore_fb_init_count;
 -- 
-1.7.7.1
+1.7.8.6
 

index 05cc9db..ad724d0 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index e9de45c..de8af5f 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.0+svnr${SRCPV}"
+PV = "1.6.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index ac03014..f6b3f3e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index b2d27fa..9af3b6d 100644
@@ -1,6 +1,6 @@
-EFL_PREFERRED_VERSION ?= "1.2.0+svn%"
-EFL_PREFERRED_VERSION_1.0 ?= "1.0.0+svn%"
-EFL_PREFERRED_VERSION_EET ?= "1.6.0+svn%"
+EFL_PREFERRED_VERSION ?= "1.2.1+svn%"
+EFL_PREFERRED_VERSION_1.0 ?= "1.0.1+svn%"
+EFL_PREFERRED_VERSION_EET ?= "1.6.1+svn%"
 
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"

new file mode 100644
index 0000000..2bb4f7c
@@ -0,0 +1,19 @@
+DESCRIPTION = "Enlightenment Terminal Emulator"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
+DEPENDS = "evas ecore edje elementary eina eet emotion"
+
+PV = "0.1.0+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV}"
+
+inherit e gettext
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
+
+FILES_${PN} += "\
+        ${datadir}/icons/terminology.png \
+"

index 99ec3f3..4292c1b 100644
@@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 python populate_packages_prepend () {

@@ -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,11 @@ 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_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
+PACKAGES += "${PN}-cserve2"
+PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*"
 
 RRECOMMENDS_${PN} = " \
   evas-engine-fb \

index 720703e..503dc52 100644
@@ -1,5 +1,7 @@
 require ${BPN}.inc
 
+inherit gettext
+
 SRCREV = "${EFL_SRCREV}"
 PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"

index 0c9ad93..3e1a660 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas eina ecore edje efreet edbus eeze"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"

index 3e1a660..6b6dd96 100644
@@ -4,6 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -71,6 +72,7 @@ PACKAGES =+ "\
   ${PN}-theme-default \
   ${PN}-background-dark-gradient \
   ${PN}-background-light-gradient \
+  ${PN}-backgrounds \
   ${PN}-images \
   ${PN}-icons \
   ${PN}-other \

@@ -122,7 +124,8 @@ FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
 FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
 FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
 FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
-FILES_${PN}-images = "${datadir}/enlightenment/data/images"
+FILES_${PN}-backgrounds = "${datadir}/enlightenment/data/backgrounds/*.edj"
+FILES_${PN}-images = "${datadir}/enlightenment/data/images ${datadir}/enlightenment/data/flags"
 FILES_${PN}-icons = "${datadir}/enlightenment/data/icons"
 FILES_${PN}-other = "${datadir}/enlightenment/data/other"
 FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods"

@@ -132,6 +135,7 @@ FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 
 FILES_efm-desktop-icon = "\
   ${datadir}/applications/efm.desktop \
+  ${datadir}/applications/enlightenment_filemanager.desktop \
   ${datadir}/icons/e-module-fileman.png \
 "
 

index 6b6dd96..f65292b 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -185,7 +185,6 @@ FILES_${PN}-doc += "\
 CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf"
 
-ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "16"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/enlightenment_start.oe"
+ALTERNATIVE_PRIORITY[x-window-manager] = "16"

deleted file mode 100644
index dcd3a46..0000000
@@ -1,76 +0,0 @@
-From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001
-From: "[email protected]"
- <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 10 Apr 2012 22:59:04 +0000
-Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running
- make_names.pl.
- https://bugs.webkit.org/show_bug.cgi?id=83225
-
-Reviewed by Rob Buis.
-
-This is necessary to make CMake-based ports build with the
-recently-released GCC 4.7.0, whose preprocessor seems to ignore
-empty lines when -P is passed to it.  Such behavior breaks
-make_names.pl (in fact, InFilesParser.pm), which expects an empty
-line to separate common and specific sections in .in files.
-
-A fix for this same problem has been supposedly done in r84123,
-but as the CMake-based ports always pass --preprocessor to the
-Perl tools the fix never reached us.
-
-The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS
-for (!MSVC && !QNX) and use it in the macros which call
-make_names.pl.
-
-* Source/cmake/OptionsCommon.cmake:
-* Source/cmake/WebKitMacros.cmake:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- ChangeLog                        |   24 ++++++++++++++++++++++++
- Source/cmake/OptionsCommon.cmake |    7 +++++++
- Source/cmake/WebKitMacros.cmake  |    2 +-
- 3 files changed, 32 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
-index 11581e6..37cb4a8 100644
---- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX)
-     ADD_DEFINITIONS(-DXP_UNIX)
- ENDIF (WTF_OS_UNIX)
- 
-+# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
-+# version, -P does not output empty lines, which currently breaks make_names.pl in
-+# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
-+# the reader.
- IF (MSVC)
-     # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
-     GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSE ()
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
- ENDIF ()
- 
- SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 3abe342..4e7ca9f 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
-     ADD_CUSTOM_COMMAND(
-         OUTPUT  ${_outputfiles}
-         DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
--        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-+        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-         VERBATIM)
- ENDMACRO ()
- 
--- 
-1.7.7
-

deleted file mode 100644
index 6958b9e..0000000
@@ -1,28 +0,0 @@
-From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 14 Feb 2012 09:56:53 +0100
-Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl
-
-* needed for libwtf_efl
-* otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free'
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- Source/JavaScriptCore/shell/PlatformEfl.cmake |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-index c35af2d..ef3f437 100644
---- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
-+++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-@@ -1,6 +1,7 @@
- LIST(APPEND JSC_LIBRARIES
-     ${Glib_LIBRARIES}
-     ${ECORE_LIBRARIES}
-+    ${EINA_LIBRARIES}
-     ${CMAKE_DL_LIBS}
- )
- 
--- 
-1.7.8.4
-

index c130867..8071d61 100644
@@ -11,19 +11,15 @@ ENDIF ()
 # -----------------------------------------------------------------------------
 # Default library type
 # -----------------------------------------------------------------------------
-SET(ENABLE_WEBCORE On)
+SET(ENABLE_WEBCORE ON)
 
 IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
-    SET(ENABLE_WEBKIT On)
+    SET(ENABLE_WEBKIT ON)
 ENDIF ()
 
-OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
-IF (ONLY_BUILD_JAVASCRIPTCORE)
-    SET(ENABLE_WEBCORE Off)
-    SET(ENABLE_WEBKIT Off)
-    SET(ENABLE_WEBKIT2 Off)
-ENDIF ()
+SET(ENABLE_TOOLS ON)
 
+SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")

@@ -35,10 +31,15 @@ SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
 SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+SET(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)

@@ -109,24 +110,24 @@ SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
 SET(WebCore_LIBRARY_NAME WebCore)
 SET(WebKit_LIBRARY_NAME WebKit)
 SET(WebKit2_LIBRARY_NAME WebKit2)
+SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
 
 # -----------------------------------------------------------------------------
 # Default library types
 # -----------------------------------------------------------------------------
-OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries")
+OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
 
 IF (SHARED_CORE)
-    SET(WTF_LIBRARY_TYPE SHARED)
     SET(JavaScriptCore_LIBRARY_TYPE SHARED)
     SET(WebCore_LIBRARY_TYPE SHARED)
 ELSE ()
-    SET(WTF_LIBRARY_TYPE STATIC)
     SET(JavaScriptCore_LIBRARY_TYPE STATIC)
     SET(WebCore_LIBRARY_TYPE STATIC)
 ENDIF ()
 
 SET(WebKit_LIBRARY_TYPE SHARED)
 SET(WebKit2_LIBRARY_TYPE SHARED)
+SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 # -----------------------------------------------------------------------------
 # Port-specific options

@@ -135,6 +136,13 @@ INCLUDE(OptionsCommon)
 INCLUDE(Options${PORT})
 
 # -----------------------------------------------------------------------------
+# Enable API unit tests and create a target for the test runner
+# -----------------------------------------------------------------------------
+IF (ENABLE_API_TESTS)
+    ENABLE_TESTING()
+ENDIF ()
+
+# -----------------------------------------------------------------------------
 # Install JavaScript shell
 # -----------------------------------------------------------------------------
 OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")

@@ -152,9 +160,7 @@ ADD_SUBDIRECTORY(Source)
 # -----------------------------------------------------------------------------
 # Add tools
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Tools)
+IF (ENABLE_TOOLS)
+    ADD_SUBDIRECTORY(Tools)
+ENDIF ()
 
-# -----------------------------------------------------------------------------
-# Prints a summary of all enabled/disabled features
-# -----------------------------------------------------------------------------
-WEBKIT_PRINT_FEATURES()

index 0c490c3..4ef4759 100644
@@ -9,9 +9,9 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
            libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
            libxml2 pango eina ecore evas edje"
 
-SRCREV = "105069"
-PV = "1.7.3+svnr${SRCPV}"
-PR = "r2"
+# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
+SRCREV = "120144"
+PV = "1.9.3+svnr${SRCPV}"
 
 SRCREV_FORMAT = "source"
 

@@ -19,8 +19,6 @@ SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
-  file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \
-  file://0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch \
   file://CMakeLists.txt \
 "
 

@@ -34,7 +32,7 @@ inherit cmake lib_package pkgconfig perlnative
 
 ARM_INSTRUCTION_SET = "arm"
 
-EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"
+EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
 
 LEAD_SONAME = "libewebkit.so"
 PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"

new file mode 100644
index 0000000..a1f14df
@@ -0,0 +1,38 @@
+From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Wed, 18 Jul 2012 17:54:50 +0200
+Subject: [PATCH] eve: update for newer webkit-efl
+
+* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get
+  in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438)
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ src/bin/chrome.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/chrome.c b/src/bin/chrome.c
+index e402cad..ee8f0c4 100644
+--- a/src/bin/chrome.c
++++ b/src/bin/chrome.c
+@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
+    if (old_icon) evas_object_del(old_icon);
+    if (url)
+      {
+-        favicon = ewk_settings_icon_database_icon_object_add(url, canvas);
++        favicon = ewk_settings_icon_database_icon_object_get(url, canvas);
+         if (favicon)
+            elm_object_part_content_set(text_url, "icon", favicon);
+      }
+@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part)
+           {
+              Evas_Object *chrome = evas_object_data_get(obj, "chrome");
+              Evas *canvas = evas_object_evas_get(chrome);
+-             icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas);
++             icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas);
+           }
+         return icon;
+      }
+-- 
+1.7.8.6
+

index d760c4a..9528ff3 100644
@@ -3,6 +3,7 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext

@@ -14,6 +15,7 @@ do_configure_prepend() {
 }
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
+  file://0001-eve-update-for-newer-webkit-efl.patch \
 "
 
 EXTRA_OECONF = "\

index 2bb4f7c..48d229b 100644
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
 DEPENDS = "evas ecore edje elementary eina eet emotion"
 
 PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext

@@ -17,3 +18,8 @@ EXTRA_OECONF = "\
 FILES_${PN} += "\
         ${datadir}/icons/terminology.png \
 "
+
+# doesn't start without own theme
+# ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error
+# CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'?
+RDEPENDS_${PN} += "${PN}-themes"

index 375f914..4bcc2bc 100644
@@ -3,12 +3,12 @@ SECTION = "e/apps"
 inherit e-base autotools pkgconfig binconfig
 
 do_prepsources () {
-	make clean distclean || true
+    make clean distclean || true
 }
 addtask prepsources after do_patch before do_configure
 
 do_configure_append() {
-	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+    find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
 export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"

index 792343b..7cf8556 100644
@@ -10,13 +10,13 @@ inherit e-base autotools
 # evas-native looks at this var, so keep it
 
 do_configure_prepend() {
-	autopoint || touch config.rpath
+    autopoint || touch config.rpath
 }
 
 do_install_prepend () {
-	for i in `find ${S}/ -name "*.pc" -type f` ; do \
-		sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
-	done
+    for i in `find ${S}/ -name "*.pc" -type f` ; do \
+        sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
+    done
 }
 
 PACKAGES =+ "${PN}-themes"

index 6ca5e3f..a4df6a6 100644
@@ -20,24 +20,24 @@ S = "${WORKDIR}/${SRCNAME}"
 
 
 do_configure_prepend() {
-	# prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
-        sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
+    # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
+    sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
 }
 
 do_install_append() {
-	if [ -e examples ]; then
-		for i in `find examples -name "*.edc"`; do
-			cd ${S}/`dirname $i`
-			echo "Generating .edj file for $i..."
-			edje_cc `basename $i`
-			echo "Removing sources in this directory..."
-			rm -f *.edc *.png *.ttf *.jpeg
-		done
-		cd ${S}
-		install -d ${D}${datadir}/${PN}/
-		cp -a examples ${D}${datadir}/${PN}/
-		find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf
-	fi
+    if [ -e examples ]; then
+        for i in `find examples -name "*.edc"`; do
+            cd ${S}/`dirname $i`
+            echo "Generating .edj file for $i..."
+            edje_cc `basename $i`
+            echo "Removing sources in this directory..."
+            rm -f *.edc *.png *.ttf *.jpeg
+        done
+        cd ${S}
+        install -d ${D}${datadir}/${PN}/
+        cp -a examples ${D}${datadir}/${PN}/
+        find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf
+    fi
 }
 
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"

index 5ff0681..1bf5f1d 100644
@@ -24,12 +24,12 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \
 S = "${WORKDIR}/${SRCNAME}"
 
 do_compile() {
-	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj
+    ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj
 }
 
 do_install() {
-        install -d ${D}${datadir}/enlightenment/data/themes/
-        install -m 0644 ${S}/efenniht.edj ${D}${datadir}/enlightenment/data/themes/
+    install -d ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/efenniht.edj ${D}${datadir}/enlightenment/data/themes/
 }
 
 FILES_${PN} = "${datadir}/enlightenment/data/themes/"

index 77c6f04..ed9b906 100644
@@ -85,10 +85,10 @@
     <Directory>Accessories.directory</Directory>
     <Include>
       <And>
-	<Or>
+        <Or>
           <Category>Applications</Category>
-	  <Category>Utility</Category>
-	</Or>
+          <Category>Utility</Category>
+        </Or>
         <Not>
           <Category>System</Category>
           <Category>Office</Category>

index 6f5fab1..7cc2167 100644
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
 "
 
 do_configure_prepend() {
-	autopoint || true
+    autopoint || true
 }
 
 do_install_append() {

index 81be734..470f03d 100644
@@ -35,9 +35,9 @@ do_configure_prepend() {
 }
 
 pkg_postinst_${PN} () {
-	echo "enjoy:	SCAN and LIBRARY MANAGER are not implemeted yet!"
-	echo "enjoy:	Meanwhile please run:"
-	echo "enjoy:	test-lms -m mono -p id3 -i 5000 -s /path/to/your/music/dir /home/root/.config/enjoy/media.db"
-	echo "enjoy:"
-	echo "enjoy:	Use test-lms -P to see available formats that can be scanned"
+    echo "enjoy:    SCAN and LIBRARY MANAGER are not implemeted yet!"
+    echo "enjoy:    Meanwhile please run:"
+    echo "enjoy:    test-lms -m mono -p id3 -i 5000 -s /path/to/your/music/dir /home/root/.config/enjoy/media.db"
+    echo "enjoy:"
+    echo "enjoy:    Use test-lms -P to see available formats that can be scanned"
 }

index c5219b7..4938900 100644
@@ -8,8 +8,8 @@ DEPENDS += "elementary exalt edje-native"
 CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus"
 
 do_configure_prepend() {
-	sed -i -e /po/d configure.ac 
-	sed -i -e s:\ po::g Makefile.am
+    sed -i -e /po/d configure.ac 
+    sed -i -e s:\ po::g Makefile.am
 }
 
 FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \

index 3207a4b..a5590e1 100644
@@ -19,13 +19,13 @@ EXTRA_OECONF = " \
 "
 
 do_install_append() {
-	# install dbus config file
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf
+    # install dbus config file
+    install -d ${D}${sysconfdir}/dbus-1/system.d/
+    install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf
 
-	# install dbus service file
-	install -d ${D}${datadir}/dbus-1/system-services/	
-	install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/
+    # install dbus service file
+    install -d ${D}${datadir}/dbus-1/system-services/
+    install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/
 }
 
 FILES_${PN} += "${datadir}/dbus-1"

index 36e8505..55f3282 100644
@@ -2,7 +2,7 @@ SECTION = "x11/data"
 
 SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master \
            file://0001-Makefile-update-KEYBOARDS_DIR-for-new-illume2.patch \
-	   file://LICENSE"
+           file://LICENSE"
 S = "${WORKDIR}/git"
 
 SRCREV = "4064489f359a1addf572089b582f317dff5f50e1"

@@ -93,6 +93,6 @@ DESCRIPTION_illume-keyboard-persian = "Illume keyboard with persian layout"
 FILES_illume-keyboard-persian = "${KEYBOARDS_DIR}/Persian.kbd ${KEYBOARDS_DIR}/Persian.png"
 
 do_install() {
-	make DESTDIR=${D} install
+    make DESTDIR=${D} install
 }
 

index 1e429e7..e45cd44 100644
@@ -5,8 +5,8 @@ PR = "${INC_PR}.0"
 require e-module.inc
 
 do_configure_prepend() {
-	sed -i -e /po/d configure.ac 
-	sed -i -e s:\ po::g Makefile.am
+    sed -i -e /po/d configure.ac 
+    sed -i -e s:\ po::g Makefile.am
 }
 
 

index 5c19933..6a6184b 100644
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 require e-module.inc
 
 do_configure_prepend() {
-	autopoint || touch config.rpath
+    autopoint || touch config.rpath
 }
 
 # Calls /usr/bin/eject for media

index 8738f35..917fe38 100644
@@ -5,8 +5,8 @@ PR = "${INC_PR}.0"
 require e-module.inc
 
 do_configure_prepend() {
-	sed -i -e /po/d configure.ac 
-	sed -i -e s:\ po::g Makefile.am
+    sed -i -e /po/d configure.ac 
+    sed -i -e s:\ po::g Makefile.am
 }
 
 

index 465ffcf..9689f46 100644
@@ -10,7 +10,7 @@ DEPENDS += "emprint"
 RDEPENDS_${PN} += "emprint"
 
 do_configure_prepend() {
-	sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac
+    sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac
 }
 
 

index bc4758a..e2fff0e 100644
@@ -13,8 +13,8 @@ BBCLASSEXTEND = "native"
 INC_PR = "r0"
 
 do_configure_prepend() {
-	touch ${S}/po/Makefile.in.in || true
-	sed -i -e 's: po::g' ${S}/Makefile.am
+    touch ${S}/po/Makefile.in.in || true
+    sed -i -e 's: po::g' ${S}/Makefile.am
 }
 
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"

index 1af86e3..dc39fa9 100644
@@ -1,6 +1,6 @@
 
 def get_edje_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--enable-fixed-point"
-	return ""
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--enable-fixed-point"
+    return ""
 

index 311fb52..b3011b4 100644
@@ -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: 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: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:\"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
-		sed -i -e 's:-L/usr/local/lib::g'  $i
-	done
+    for i in $(find "${S}" -name "Makefile") ; do
+        sed -i -e 's:-L/usr/local/lib::g'  $i
+    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

index d764e96..8fb2dab 100644
@@ -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 -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/
+    install -d ${D}${datadir}/elementary/themes/
+    install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/
 }
 
 FILES_${PN} = "${datadir}/elementary/themes/"

index 83de3fe..4cc124e 100644
@@ -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-libraries=${STAGING_LIBDIR} "
+                --x-includes=${STAGING_INCDIR} \
+                --x-libraries=${STAGING_LIBDIR} "
 
 # TODO: Use more fine granular version
 #OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"

index 27dd2eb..c1e564f 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "70490"
+EFL_SRCREV ?= "74035"
 
 ARM_INSTRUCTION_SET = "arm"

new file mode 100644
index 0000000..a2ce285
@@ -0,0 +1,41 @@
+From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+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 <[email protected]>
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ 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
+

index a2ce285..55773a3 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Martin Jansa <[email protected]>
 ---
- 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);
- 
-    return _ecore_fb_init_count;
-@@ -59,6 +62,7 @@ ecore_fb_shutdown(void)
-    if (--_ecore_fb_init_count != 0)
-       return _ecore_fb_init_count;
- 
+    if (!oldhand)
+      {
+         oldhand = signal(SIGINT, nosigint);
+@@ -77,6 +80,7 @@ ecore_fb_shutdown(void)
+         oldhand = NULL;
+      }
+    
 +   ecore_fb_ts_shutdown();
     ecore_fb_vt_shutdown();
  
     return _ecore_fb_init_count;
 -- 
-1.7.7.1
+1.7.8.6
 

index 05cc9db..ad724d0 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index e9de45c..de8af5f 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.0+svnr${SRCPV}"
+PV = "1.6.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index f43c47f..eb28d9a 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index ac03014..f6b3f3e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index 594de4a..720703e 100644
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 

index b2d27fa..9af3b6d 100644
@@ -1,6 +1,6 @@
-EFL_PREFERRED_VERSION ?= "1.2.0+svn%"
-EFL_PREFERRED_VERSION_1.0 ?= "1.0.0+svn%"
-EFL_PREFERRED_VERSION_EET ?= "1.6.0+svn%"
+EFL_PREFERRED_VERSION ?= "1.2.1+svn%"
+EFL_PREFERRED_VERSION_1.0 ?= "1.0.1+svn%"
+EFL_PREFERRED_VERSION_EET ?= "1.6.1+svn%"
 
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"

new file mode 100644
index 0000000..2bb4f7c
@@ -0,0 +1,19 @@
+DESCRIPTION = "Enlightenment Terminal Emulator"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
+DEPENDS = "evas ecore edje elementary eina eet emotion"
+
+PV = "0.1.0+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV}"
+
+inherit e gettext
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
+
+FILES_${PN} += "\
+        ${datadir}/icons/terminology.png \
+"

index b0a42ea..5254ee4 100644
@@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 python populate_packages_prepend () {

@@ -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,11 @@ 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_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
+PACKAGES += "${PN}-cserve2"
+PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*"
 
 RRECOMMENDS_${PN} = " \
   evas-engine-fb \

index 720703e..503dc52 100644
@@ -1,5 +1,7 @@
 require ${BPN}.inc
 
+inherit gettext
+
 SRCREV = "${EFL_SRCREV}"
 PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"

index 7cc2167..7cc072e 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas eina ecore edje efreet edbus eeze"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
 PR = "r2"

index 7cc072e..c2bb1e7 100644
@@ -72,6 +72,7 @@ PACKAGES =+ "\
   ${PN}-theme-default \
   ${PN}-background-dark-gradient \
   ${PN}-background-light-gradient \
+  ${PN}-backgrounds \
   ${PN}-images \
   ${PN}-icons \
   ${PN}-other \

@@ -123,7 +124,8 @@ FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
 FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
 FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
 FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
-FILES_${PN}-images = "${datadir}/enlightenment/data/images"
+FILES_${PN}-backgrounds = "${datadir}/enlightenment/data/backgrounds/*.edj"
+FILES_${PN}-images = "${datadir}/enlightenment/data/images ${datadir}/enlightenment/data/flags"
 FILES_${PN}-icons = "${datadir}/enlightenment/data/icons"
 FILES_${PN}-other = "${datadir}/enlightenment/data/other"
 FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods"

@@ -133,6 +135,7 @@ FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 
 FILES_efm-desktop-icon = "\
   ${datadir}/applications/efm.desktop \
+  ${datadir}/applications/enlightenment_filemanager.desktop \
   ${datadir}/icons/e-module-fileman.png \
 "
 

index 2bb4f7c..48d229b 100644
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03f6c2cf2bef233fadf7d0769f5bfda7"
 DEPENDS = "evas ecore edje elementary eina eet emotion"
 
 PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext

@@ -17,3 +18,8 @@ EXTRA_OECONF = "\
 FILES_${PN} += "\
         ${datadir}/icons/terminology.png \
 "
+
+# doesn't start without own theme
+# ERR<770>:terminology utils.c:26 theme_apply() Could not load any theme for group=terminology/background: No Error
+# CRI<770>:terminology main.c:448 elm_main() Couldn't find terminology theme! Forgot 'make install'?
+RDEPENDS_${PN} += "${PN}-themes"

index ad20c8c..cca9c5e 100644
@@ -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"
 

deleted file mode 100644
index a1f14df..0000000
@@ -1,38 +0,0 @@
-From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Wed, 18 Jul 2012 17:54:50 +0200
-Subject: [PATCH] eve: update for newer webkit-efl
-
-* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get
-  in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438)
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- src/bin/chrome.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/chrome.c b/src/bin/chrome.c
-index e402cad..ee8f0c4 100644
---- a/src/bin/chrome.c
-+++ b/src/bin/chrome.c
-@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
-    if (old_icon) evas_object_del(old_icon);
-    if (url)
-      {
--        favicon = ewk_settings_icon_database_icon_object_add(url, canvas);
-+        favicon = ewk_settings_icon_database_icon_object_get(url, canvas);
-         if (favicon)
-            elm_object_part_content_set(text_url, "icon", favicon);
-      }
-@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part)
-           {
-              Evas_Object *chrome = evas_object_data_get(obj, "chrome");
-              Evas *canvas = evas_object_evas_get(chrome);
--             icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas);
-+             icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas);
-           }
-         return icon;
-      }
--- 
-1.7.8.6
-

index 9528ff3..d760c4a 100644
@@ -3,7 +3,6 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
-PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext

@@ -15,7 +14,6 @@ do_configure_prepend() {
 }
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
-  file://0001-eve-update-for-newer-webkit-efl.patch \
 "
 
 EXTRA_OECONF = "\

new file mode 100644
index 0000000..db1b15d
@@ -0,0 +1,51 @@
+From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Thu, 26 Jul 2012 10:35:35 +0200
+Subject: [PATCH] edbus: configure.ac fixup performance_test
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ configure.ac |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d798484..d0fc4ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,7 @@ want_ehal="yes"
+ want_enotify="yes"
+ want_eofono="yes"
+ want_eukit="yes"
++want_performance_test="yes"
+ 
+ case "$host_os" in
+    mingw*)
+@@ -78,6 +79,7 @@ case "$host_os" in
+       want_enotify="no"
+       want_eofono="no"
+       want_eukit="no"
++      want_performance_test="no"
+       ;;
+ esac
+ 
+@@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit],
+ AC_ARG_ENABLE([performance_test],
+    [AC_HELP_STRING([--disable-performance_test], [Disable performance build])],
+    [enable_performance_test=$enableval],
+-   [enable_performance_test="${want_eukit}"])
++   [enable_performance_test="${want_performance_test}"])
+ 
+ 
+ ### Checks for programs
+@@ -277,7 +279,7 @@ fi
+ 
+ if test "x${have_edbus_performance_test}" = "xyes" ; then
+    PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST],
+-      [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary],
++      [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99],
+       [have_edbus_performance_test="yes"],
+       [have_edbus_performance_test="no"])
+ fi
+-- 
+1.7.8.6
+

index 720703e..c22fcaf 100644
@@ -5,7 +5,9 @@ PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
+EXTRA_OECONF += "--disable-performance_test"
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+  file://0001-edbus-configure.ac-fixup-performance_test.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"

index c2bb1e7..b97cb50 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
-DEPENDS = "eet evas eina ecore edje efreet edbus eeze"
+DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"

index c1e564f..d52b4dc 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74035"
+EFL_SRCREV ?= "74419"
 
 ARM_INSTRUCTION_SET = "arm"

deleted file mode 100644
index db1b15d..0000000
@@ -1,51 +0,0 @@
-From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Thu, 26 Jul 2012 10:35:35 +0200
-Subject: [PATCH] edbus: configure.ac fixup performance_test
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- configure.ac |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d798484..d0fc4ee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,6 +69,7 @@ want_ehal="yes"
- want_enotify="yes"
- want_eofono="yes"
- want_eukit="yes"
-+want_performance_test="yes"
- 
- case "$host_os" in
-    mingw*)
-@@ -78,6 +79,7 @@ case "$host_os" in
-       want_enotify="no"
-       want_eofono="no"
-       want_eukit="no"
-+      want_performance_test="no"
-       ;;
- esac
- 
-@@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit],
- AC_ARG_ENABLE([performance_test],
-    [AC_HELP_STRING([--disable-performance_test], [Disable performance build])],
-    [enable_performance_test=$enableval],
--   [enable_performance_test="${want_eukit}"])
-+   [enable_performance_test="${want_performance_test}"])
- 
- 
- ### Checks for programs
-@@ -277,7 +279,7 @@ fi
- 
- if test "x${have_edbus_performance_test}" = "xyes" ; then
-    PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST],
--      [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary],
-+      [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99],
-       [have_edbus_performance_test="yes"],
-       [have_edbus_performance_test="no"])
- fi
--- 
-1.7.8.6
-

index c22fcaf..d40deb2 100644
@@ -8,6 +8,5 @@ DEFAULT_PREFERENCE = "-1"
 EXTRA_OECONF += "--disable-performance_test"
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
-  file://0001-edbus-configure.ac-fixup-performance_test.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"

index 1607d87..f527959 100644
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 PR = "${INC_PR}.2"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "edje python-evas"
+DEPENDS += "edje python-evas evas"
 RDEPENDS_${PN} += "python-evas"
 
 SRC_URI += "file://0001-fix-unicode-conversion.patch"

index d52b4dc..4a06d4a 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74419"
+EFL_SRCREV ?= "74527"
 
 ARM_INSTRUCTION_SET = "arm"

index eb28d9a..fa8a8e8 100644
@@ -4,6 +4,7 @@ SRCREV = "${EFL_SRCREV}"
 PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
+DEPENDS += "eio"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \

index 9af3b6d..38c2dd3 100644
@@ -18,6 +18,7 @@ PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_evas-generic-loaders ?= "1.2.0+svn%"
 PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}"

new file mode 100644
index 0000000..7556eb2
@@ -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-*"

new file mode 100644
index 0000000..de0ce1c
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
+"
+
+SRC_URI[md5sum] = "340a8c2f42c82ecd10f0204cdb291a70"
+SRC_URI[sha256sum] = "9a3aad43269f34513765b04ed3e8db5a18d3545da010b2f6066aeaf90bf442d4"

new file mode 100644
index 0000000..594de4a
@@ -0,0 +1,11 @@
+require ${BPN}.inc
+
+SRCREV = "${EFL_SRCREV}"
+PV = "1.2.0+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "\
+  ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+"
+S = "${WORKDIR}/${SRCNAME}"

index 720703e..a869caf 100644
@@ -2,9 +2,14 @@ require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
 PV = "1.2.1+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 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_${BPN} += "evas-loader-generic evas-generic-loader-svn"
+
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "

index 7cf8556..bc2f640 100644
@@ -60,4 +60,4 @@ FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
 
 FILES_${PN}-tests  = "${bindir}/${PN} \
                       ${bindir}/*_* \
-                      ${datadir}"
+                      ${datadir}/${PN}"

index 4a06d4a..5198c4b 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74527"
+EFL_SRCREV ?= "74542"
 
 ARM_INSTRUCTION_SET = "arm"

index 720703e..ffc8cf7 100644
@@ -9,3 +9,5 @@ SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
+
+FILES_${PN} += "${datadir}/mime/packages/edje.xml"

index d40deb2..b99f79d 100644
@@ -5,8 +5,12 @@ PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-EXTRA_OECONF += "--disable-performance_test"
+# 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"

index eb28d9a..bf75d9e 100644
@@ -5,6 +5,8 @@ PV = "1.0.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
+DEPENDS += "eio"
+
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "

index b97cb50..6d4656b 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
-DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio"
+DEPENDS = "eet evas eina ecore edje efreet edbus eeze eio elementary"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"

index 6d4656b..cce5ad1 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -54,6 +54,10 @@ RDEPENDS_${PN} += "\
   edje-utils \
   ${PN}-utils \
   dbus-x11 \
+  evas-loader-png \
+  evas-loader-jpeg \
+  evas-loader-gif \
+  evas-generic-loader-svg \
 "
 
 # Uclibc build don't have 'glibc-utils'

index a869caf..fb0342f 100644
@@ -8,7 +8,7 @@ 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_${BPN} += "evas-loader-generic evas-generic-loader-svn"
+RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \

index 5198c4b..990ce5a 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74542"
+EFL_SRCREV ?= "74702"
 
 ARM_INSTRUCTION_SET = "arm"

index 470f03d..06998cf 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Enjoy music player"
 LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0f507c68d42d1cc0fcb507d007112bf2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary emotion lightmediascanner"
 SRCREV = "${EFL_SRCREV}"
 PV = "0.0+svnr${SRCPV}"

index ffc8cf7..435b899 100644
@@ -5,6 +5,8 @@ PV = "1.2.1+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
+DEPENDS += "eio"
+
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "

index de17e05..089e92e 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 
 EXTRA_OECONF = "\
   --enable-openssl \

@@ -16,3 +16,9 @@ EXTRA_OECONF = "\
   --enable-old-eet-file-format \
   --disable-assert \
 "
+
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-utils = "\
+  ${bindir}/${PN} \
+"

index 990ce5a..1ee7ca8 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74702"
+EFL_SRCREV ?= "74879"
 
 ARM_INSTRUCTION_SET = "arm"

index cce5ad1..bbe5ef9 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -110,6 +110,7 @@ FILES_${PN} = "\
   ${libdir}/enlightenment/*plugins/*/*/* \
   ${libdir}/enlightenment/preload/e_precache.so \
   ${datadir}/enlightenment/data/icons \
+  ${datadir}/enlightenment/data/favorites \
   ${datadir}/enlightenment/data/input_methods \
   ${datadir}/enlightenment/data/config/profile.cfg \
   ${datadir}/enlightenment/AUTHORS \

index e2fff0e..1c8da18 100644
@@ -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

@@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
 inherit efl gettext
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 
 do_configure_prepend() {
     touch ${S}/po/Makefile.in.in || true

index 1ee7ca8..3621217 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74879"
+EFL_SRCREV ?= "74924"
 
 ARM_INSTRUCTION_SET = "arm"

index 3621217..53f2347 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "74924"
+EFL_SRCREV ?= "75056"
 
 ARM_INSTRUCTION_SET = "arm"

index bbe5ef9..8e70507 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76de290eb3fdda12121830191c152a7d"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -66,9 +66,13 @@ RDEPENDS_${PN}_append_libc-glibc = " glibc-utils "
 # The systray module used to be external, but is part of e-wm now
 RREPLACES_${PN} = "systray"
 
+RREPLACES_${PN}-config-mobile = "${PN}-config-illume2"
+RCONFLICTS_${PN}-config-mobile = "${PN}-config-illume2"
+RPROVIDES_${PN}-config-mobile = "${PN}-config-illume2"
+
 PACKAGES =+ "\
   ${PN}-config-default \
-  ${PN}-config-illume2 \
+  ${PN}-config-mobile \
   ${PN}-config-minimalist \
   ${PN}-config-netbook \
   ${PN}-config-scaleable \

@@ -120,7 +124,7 @@ FILES_${PN} = "\
 "
 
 FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
-FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume"
+FILES_${PN}-config-mobile = "${datadir}/enlightenment/data/config/mobile"
 FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist"
 FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook"
 FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable"

index 53f2347..439e5bf 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "75056"
+EFL_SRCREV ?= "75077"
 
 ARM_INSTRUCTION_SET = "arm"

similarity index 64%
rename from meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch
rename to meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
index a9beea0..a82d1ed 100644
@@ -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 <[email protected]>
 Date: Thu, 24 Nov 2011 13:25:33 +0100
 Subject: [PATCH] pam: use common-auth instead of system-auth
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---
- 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
-index 3476d55..47d29222 100644
---- a/data/elsa
-+++ b/data/elsa
-@@ -1,7 +1,7 @@
- # File autogenerated by pamd_mimic in pam eclass
- 
- 
+diff --git a/data/entrance b/data/entrance
+index 872c83d..2b98c3a 100644
+--- a/data/entrance
++++ b/data/entrance
+@@ -1,4 +1,4 @@
 -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
 

similarity index 92%
rename from meta-efl/recipes-efl/efl/elsa_svn.bb
rename to meta-efl/recipes-efl/efl/entrance_svn.bb
index e23a694..585d552 100644
@@ -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"

similarity index 55%
rename from meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
index 0b9c0f5..4828686 100644
@@ -2,7 +2,7 @@
 Description=Login manager for Enlightenment
 
 [Service]
-ExecStart=/usr/sbin/elsa
+ExecStart=/usr/sbin/entrance
 
 [Install]
-WantedBy=multi-user.target
+Alias=display-manager.service

similarity index 100%
rename from meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend

index 439e5bf..4708fdd 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "75077"
+EFL_SRCREV ?= "75097"
 
 ARM_INSTRUCTION_SET = "arm"

index 4708fdd..4213098 100644
@@ -1,6 +1,9 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
+SRCVER ?= "${PV}"
 
 EFL_SRCREV ?= "75097"
 
 ARM_INSTRUCTION_SET = "arm"
+
+S = "${WORKDIR}/${SRCNAME}-${SRCVER}"

deleted file mode 100644
index c3890ff..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e9dfdf3dc35fdbec189914e3960c9949"
-SRC_URI[sha256sum] = "533b18a823c8e417bd3b04db8d4f3ad7dcb4596e14397e38dd1788d39d98fe3d"

new file mode 100644
index 0000000..ffe6546
@@ -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"

index 594de4a..06cf950 100644
@@ -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"
 

41 lines not on this page · raw message

index 1c8da18..9faaf3a 100644
@@ -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

45 lines not on this page · raw message

deleted file mode 100644
index bec47a7..0000000
@@ -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"

new file mode 100644
index 0000000..33e3976
@@ -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"

index ad724d0..e00a0cc 100644
@@ -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"
 

index cca9c5e..ae558f0 100644
@@ -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"
+

deleted file mode 100644
index 9137115..0000000
@@ -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"

new file mode 100644
index 0000000..7b56e12
@@ -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"

index b99f79d..06cf950 100644
@@ -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"

index b3011b4..6f50ea8 100644
@@ -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"

deleted file mode 100644
index 8f22e50..0000000
@@ -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"

new file mode 100644
index 0000000..1ba83c0
@@ -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"

index 435b899..06cf950 100644
@@ -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"

index 089e92e..0f6a9fe 100644
@@ -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 \

deleted file mode 100644
index 36894ea..0000000
@@ -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"

new file mode 100644
index 0000000..39663f9
@@ -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"

index de8af5f..06cf950 100644
@@ -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"
 

index 1b0f489..5d523c9 100644
@@ -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 = ""

deleted file mode 100644
index 9fb4e89..0000000
@@ -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"

new file mode 100644
index 0000000..4f8ecb4
@@ -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"

index 720703e..06cf950 100644
@@ -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"
 

index 9aaeaa7..6c68526 100644
@@ -3,7 +3,7 @@ DEPENDS = "ecore"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
 
-inherit efl
+inherit efl gettext
 
 INC_PR = "r0"
 

deleted file mode 100644
index d1c850a..0000000
@@ -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"

new file mode 100644
index 0000000..afe123a
@@ -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"

index 503dc52..06cf950 100644
@@ -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"
 

deleted file mode 100644
index 4714db8..0000000
@@ -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"

new file mode 100644
index 0000000..ba7bab3
@@ -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"

index 720703e..06cf950 100644
@@ -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"
 

deleted file mode 100644
index 54a35a8..0000000
@@ -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"

new file mode 100644
index 0000000..f4de7af
@@ -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"

index eb28d9a..06cf950 100644
@@ -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"
 

index 50c708d..34338e8 100644
@@ -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 \

deleted file mode 100644
index d4e3960..0000000
@@ -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"

new file mode 100644
index 0000000..2351360
@@ -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"

index fa8a8e8..06cf950 100644
@@ -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 \

deleted file mode 100644
index d3956ac..0000000
@@ -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"

new file mode 100644
index 0000000..8cd4f8c
@@ -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"

index 720703e..06cf950 100644
@@ -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"
 

index 20a8852..08a24b2 100644
@@ -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
 

deleted file mode 100644
index c142b5b..0000000
@@ -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"

new file mode 100644
index 0000000..d5f9412
@@ -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"

index bf75d9e..06cf950 100644
@@ -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 \
 "

index 0c3080c..92a83ee 100644
@@ -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
 

deleted file mode 100644
index e976238..0000000
@@ -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"

new file mode 100644
index 0000000..69f8e33
@@ -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"

index f6b3f3e..892b298 100644
@@ -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"
 

deleted file mode 100644
index de0ce1c..0000000
@@ -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"

new file mode 100644
index 0000000..5ac0b94
@@ -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"

index 594de4a..06cf950 100644
@@ -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"
 

index 5254ee4..89ae1a4 100644
@@ -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 \

deleted file mode 100644
index ddac920..0000000
@@ -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"

new file mode 100644
index 0000000..df777f5
@@ -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"

index fb0342f..06cf950 100644
@@ -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 \
 "

index 38c2dd3..b703b41 100644
@@ -1,6 +1,4 @@
-EFL_PREFERRED_VERSION ?= "1.2.1+svn%"
-EFL_PREFERRED_VERSION_1.0 ?= "1.0.1+svn%"
-EFL_PREFERRED_VERSION_EET ?= "1.6.1+svn%"
+EFL_PREFERRED_VERSION ?= "1.6.99+svn%"
 
 PREFERRED_VERSION_ecore ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ecore-native ?= "${EFL_PREFERRED_VERSION}"

@@ -18,16 +16,16 @@ PREFERRED_VERSION_eina-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_embryo ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_embryo-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_evas ?= "${EFL_PREFERRED_VERSION}"
-PREFERRED_VERSION_evas-generic-loaders ?= "1.2.0+svn%"
+PREFERRED_VERSION_evas-generic-loaders ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_evas-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_expedite ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_expedite-native ?= "${EFL_PREFERRED_VERSION}"
 
-PREFERRED_VERSION_eet ?= "${EFL_PREFERRED_VERSION_EET}"
-PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION_EET}"
+PREFERRED_VERSION_eet ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eet-native ?= "${EFL_PREFERRED_VERSION}"
 
-PREFERRED_VERSION_eio ?= "${EFL_PREFERRED_VERSION_1.0}"
-PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION_1.0}"
-PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION_1.0}"
-PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION_1.0}"
-PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION_1.0}"
+PREFERRED_VERSION_eio ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}"

index 2edf864..a6ec5e6 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "python-evas ecore"
 RDEPENDS_${PN} += "python-evas"

index 256a52a..518f7c2 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edbus python-dbus"
 RDEPENDS_${PN} += "python-dbus"

index f527959..a6b376c 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edje python-evas evas"
 RDEPENDS_${PN} += "python-evas"

index a4df6a6..498c3be 100644
@@ -6,8 +6,8 @@ AUTHOR = "Gustavo Sverzut Barbieri <[email protected]>"
 # the extension modules.
 DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
 RDEPENDS_${PN} += "python-lang"
-PV = "0.7.3+svnr${SRCPV}"
-INC_PR = "r2"
+PV = "1.6.99+svnr${SRCPV}"
+INC_PR = "r0"
 
 # necessary to let the call for python-config succeed
 export BUILD_SYS

index 911ed6f..ffb6d5e 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "elementary python-evas"
 RDEPENDS_${PN} += "python-evas python-ecore python-edje" 

index a39c0c8..89002c3 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "emotion python-evas"
 RDEPENDS_${PN} += "python-ecore"

index 8d719ce..79844be 100644
@@ -1,6 +1,6 @@
 require python-efl.inc
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "evas"

index b703b41..4625b19 100644
@@ -29,3 +29,10 @@ PREFERRED_VERSION_eio-native ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_emotion ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_ethumb ?= "${EFL_PREFERRED_VERSION}"
 PREFERRED_VERSION_elementary ?= "${EFL_PREFERRED_VERSION}"
+
+PREFERRED_VERSION_python-elementary ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-ecore ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edbus ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-edje ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-emotion ?= "${EFL_PREFERRED_VERSION}"
+PREFERRED_VERSION_python-evas ?= "${EFL_PREFERRED_VERSION}"

new file mode 100644
index 0000000..79aaeec
@@ -0,0 +1,5 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS += "python-evas ecore"
+RDEPENDS_${PN} += "python-evas"

new file mode 100644
index 0000000..a76c44f
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+
+SRC_URI[md5sum] = "86ba753726881b9bfcaa0fdc0827cd1e"
+SRC_URI[sha256sum] = "b47a155c0bfad6fad68bc0f925c54a8736a61ca72f6a71bd5138ea3298a35c95"

index a6ec5e6..a0298e8 100644
@@ -1,7 +1,8 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "python-evas ecore"
-RDEPENDS_${PN} += "python-evas"
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"

new file mode 100644
index 0000000..86ae773
@@ -0,0 +1,6 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS += "edbus python-dbus"
+RDEPENDS_${PN} += "python-dbus"
+SRCNAME = "python-e_dbus"

new file mode 100644
index 0000000..c643141
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+
+SRC_URI[md5sum] = "bd68e260e1a23fc14313afa48e70bebd"
+SRC_URI[sha256sum] = "63e823c8366f293db1940524ac76d6f91109a7202cf38ad6407d414d15e09aca"

index 518f7c2..a0298e8 100644
@@ -1,8 +1,8 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "edbus python-dbus"
-RDEPENDS_${PN} += "python-dbus"
-SRCNAME = "python-e_dbus"
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"

new file mode 100644
index 0000000..473b92e
@@ -0,0 +1,5 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS += "edje python-evas evas"
+RDEPENDS_${PN} += "python-evas"

new file mode 100644
index 0000000..1d7bb06
@@ -0,0 +1,7 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+SRC_URI += "file://0001-fix-unicode-conversion.patch"
+
+SRC_URI[md5sum] = "fbe5105abb5b2d3de71302ff3973945a"
+SRC_URI[sha256sum] = "f5004d9b784b0ca37436daacff7f4f21bb3094b9fdfc5abc95f8e57e90ecb242"

index a6b376c..3d392d0 100644
@@ -1,9 +1,10 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "edje python-evas evas"
-RDEPENDS_${PN} += "python-evas"
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"
 
 SRC_URI += "file://0001-fix-unicode-conversion.patch"

index 498c3be..77d4114 100644
@@ -6,7 +6,6 @@ AUTHOR = "Gustavo Sverzut Barbieri <[email protected]>"
 # the extension modules.
 DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
 RDEPENDS_${PN} += "python-lang"
-PV = "1.6.99+svnr${SRCPV}"
 INC_PR = "r0"
 
 # necessary to let the call for python-config succeed

@@ -15,8 +14,12 @@ export HOST_SYS
 
 inherit e-base autotools pkgconfig distutils-base
 
-SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
-S = "${WORKDIR}/${SRCNAME}"
+SRCVER = "${PV}"
+
+SRC_URI = "\
+  ${E_MIRROR}/BINDINGS/python/${SRCNAME}-${SRCVER}.tar.bz2 \
+"
+S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
 
 
 do_configure_prepend() {

new file mode 100644
index 0000000..3f1d123
@@ -0,0 +1,5 @@
+require python-efl.inc
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
+DEPENDS += "elementary python-evas"
+RDEPENDS_${PN} += "python-evas python-ecore python-edje" 

new file mode 100644
index 0000000..8ed363e
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+
+SRC_URI[md5sum] = "bad3bd52e79aeea1ee9ffa0ab8a54855"
+SRC_URI[sha256sum] = "32ded2fb4e66aa543ae9274076d031f8465167a0cc1af3fcd26bcda85b2e7094"

index ffb6d5e..a0298e8 100644
@@ -1,7 +1,8 @@
-require python-efl.inc
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "elementary python-evas"
-RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"

new file mode 100644
index 0000000..ac64676
@@ -0,0 +1,5 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS += "emotion python-evas"
+RDEPENDS_${PN} += "python-ecore"

new file mode 100644
index 0000000..a2ad303
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+
+SRC_URI[md5sum] = "34249ce9ee6602205ede16e311c2712c"
+SRC_URI[sha256sum] = "f121a801c213d5014cde17df49107407bd60be362f98bab3530c14c9c8a54e03"

index 89002c3..a0298e8 100644
@@ -1,7 +1,8 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "emotion python-evas"
-RDEPENDS_${PN} += "python-ecore"
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"

new file mode 100644
index 0000000..3211b14
@@ -0,0 +1,4 @@
+require python-efl.inc
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS += "evas"

new file mode 100644
index 0000000..8fa82da
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+
+SRC_URI[md5sum] = "c3e02d8e897508db2d6365dc3b83ae20"
+SRC_URI[sha256sum] = "5af43a770e0edaf01c679c8eaecef38c747c8801980f1d9423d040cf36220d76"

index 79844be..a0298e8 100644
@@ -1,6 +1,8 @@
-require python-efl.inc
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+require ${BPN}.inc
 PR = "${INC_PR}.0"
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "evas"
+PV = "1.6.99+svnr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};protocol=http"
+S = "${WORKDIR}/${SRCNAME}"

index 4213098..e701fb5 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "75097"
+EFL_SRCREV ?= "75359"
 
 ARM_INSTRUCTION_SET = "arm"
 

similarity index 100%
rename from meta-efl/recipes-efl/e17/expedite_1.6.99-alpha.bb
rename to meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb

similarity index 47%
rename from meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb
rename to meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb
index 33e3976..084b008 100644
@@ -2,12 +2,12 @@ require ${BPN}.inc
 
 PR = "${INC_PR}.0"
 
-SRCVER = "1.7.0-alpha"
+SRCVER = "1.7.0-beta"
 
 SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
   file://fix-ecore-fb-initialization.patch \
 "
 
-SRC_URI[md5sum] = "c40c25f2638677191bb95a628743209d"
-SRC_URI[sha256sum] = "8742fdcb725ac1494650577f75bbd36d3bf42d8d5c1f8d96a9d541f310a46c44"
+SRC_URI[md5sum] = "12360540b2b8d46022cbf228c3bdef07"
+SRC_URI[sha256sum] = "e3683d4b9be01347c564065bed36a77c6f42db56be7ea3cb6029a3b532afa1cb"

deleted file mode 100644
index 7b56e12..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..c070549
@@ -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"

deleted file mode 100644
index 1ba83c0..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..eaccde9
@@ -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"

deleted file mode 100644
index 39663f9..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..7c5a655
@@ -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"

deleted file mode 100644
index 4f8ecb4..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..446503e
@@ -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"

deleted file mode 100644
index afe123a..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..330de4e
@@ -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"

deleted file mode 100644
index ba7bab3..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..1a3632c
@@ -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"

deleted file mode 100644
index f4de7af..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..0161318
@@ -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"

deleted file mode 100644
index 2351360..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..c0ba6fa
@@ -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"

deleted file mode 100644
index 8cd4f8c..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..f9391bd
@@ -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"

deleted file mode 100644
index d5f9412..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..4ad0690
@@ -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"

deleted file mode 100644
index 69f8e33..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..0da0fb7
@@ -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"

deleted file mode 100644
index 5ac0b94..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..00956a8
@@ -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"

deleted file mode 100644
index df777f5..0000000
@@ -1,12 +0,0 @@
-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"

new file mode 100644
index 0000000..c761852
@@ -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"

similarity index 100%
rename from meta-efl/recipes-efl/e17/expedite.inc
rename to meta-efl/recipes-efl/efl/expedite.inc

similarity index 100%
rename from meta-efl/recipes-efl/e17/expedite_1.6.99-beta.bb
rename to meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb

similarity index 100%
rename from meta-efl/recipes-efl/e17/expedite_svn.bb
rename to meta-efl/recipes-efl/efl/expedite_svn.bb

deleted file mode 100644
index a76c44f..0000000
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-
-SRC_URI[md5sum] = "86ba753726881b9bfcaa0fdc0827cd1e"
-SRC_URI[sha256sum] = "b47a155c0bfad6fad68bc0f925c54a8736a61ca72f6a71bd5138ea3298a35c95"

new file mode 100644
index 0000000..f2c7750
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+
+SRC_URI[md5sum] = "7cd483e817e41017adcd23cea4ce462d"
+SRC_URI[sha256sum] = "09a99f728b946c44955ad91e3ac072643e533ded74110f481e27b8f035877a95"

deleted file mode 100644
index c643141..0000000
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-
-SRC_URI[md5sum] = "bd68e260e1a23fc14313afa48e70bebd"
-SRC_URI[sha256sum] = "63e823c8366f293db1940524ac76d6f91109a7202cf38ad6407d414d15e09aca"

new file mode 100644
index 0000000..b3d0e2e
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+
+SRC_URI[md5sum] = "d6140208bb2608bd320a70298c0c4234"
+SRC_URI[sha256sum] = "468bc77dc1b64d04c688b2f07ddcbeac406d984121b90e78ba802c92e58e4daf"

deleted file mode 100644
index 1d7bb06..0000000
@@ -1,7 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-SRC_URI += "file://0001-fix-unicode-conversion.patch"
-
-SRC_URI[md5sum] = "fbe5105abb5b2d3de71302ff3973945a"
-SRC_URI[sha256sum] = "f5004d9b784b0ca37436daacff7f4f21bb3094b9fdfc5abc95f8e57e90ecb242"

new file mode 100644
index 0000000..3d88425
@@ -0,0 +1,7 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI += "file://0001-fix-unicode-conversion.patch"
+
+SRC_URI[md5sum] = "eac613c2f3d88d30ba1adf4acd5090bf"
+SRC_URI[sha256sum] = "6ce7b57a4afaddf8dbf423543380cdc798c954b31ffd9d47e6af9536786abc05"

deleted file mode 100644
index 8ed363e..0000000
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-
-SRC_URI[md5sum] = "bad3bd52e79aeea1ee9ffa0ab8a54855"
-SRC_URI[sha256sum] = "32ded2fb4e66aa543ae9274076d031f8465167a0cc1af3fcd26bcda85b2e7094"

new file mode 100644
index 0000000..be63412
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+
+SRC_URI[md5sum] = "f2b801aa8fe53914abbcfdf14aa1d325"
+SRC_URI[sha256sum] = "1255bab89b824754c1a0909f2646ff63fd0e12478e0bfbfbdc3cfd48ea9bfa25"

deleted file mode 100644
index a2ad303..0000000
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-
-SRC_URI[md5sum] = "34249ce9ee6602205ede16e311c2712c"
-SRC_URI[sha256sum] = "f121a801c213d5014cde17df49107407bd60be362f98bab3530c14c9c8a54e03"

new file mode 100644
index 0000000..976cf56
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+
+SRC_URI[md5sum] = "3cfd52e8415f48d77fdb1fe73244c2b2"
+SRC_URI[sha256sum] = "76d673b99e5e894b469bb04f67a14492a6021edc95762ba71da7b24c36fa660a"

deleted file mode 100644
index 8fa82da..0000000
@@ -1,6 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRCVER = "1.7.0-alpha"
-
-SRC_URI[md5sum] = "c3e02d8e897508db2d6365dc3b83ae20"
-SRC_URI[sha256sum] = "5af43a770e0edaf01c679c8eaecef38c747c8801980f1d9423d040cf36220d76"

new file mode 100644
index 0000000..cabc9c8
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+
+SRC_URI[md5sum] = "19262c0baac27f35f136e4aaa3ca0171"
+SRC_URI[sha256sum] = "6784109dc637bd8a50f31eb3a9ff31e0eece0fba04c8a2a527d6bd83c1b02cf8"