efl: drop .inc and _svn.bb files for libs included in efl.git

* in preparation for merged source dir in efl.git I don't plan to support newer SRCREVs from subversion
* drop INC_PR and fold lib.inc into the recipe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

33 files changed, 467 insertions, 636 deletions

diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc
deleted file mode 100644
index fd75a00cc..000000000
--- a/meta-efl/recipes-efl/efl/ecore.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-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 gnutls \
-           libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxfixes"
-DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
-# optional
-# DEPENDS += "directfb virtual/libsdl openssl virtual/libiconv"
-
-inherit efl gettext
-
-BBCLASSEXTEND = "native"
-INC_PR = "r2"
-
-do_configure_prepend() {
-    touch ${S}/po/Makefile.in.in || true
-    sed -i -e 's: po::g' ${S}/Makefile.am
-}
-
-FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
-
-PACKAGES =+ "\
-    ${PN}-con \
-    ${PN}-config \
-    ${PN}-desktop \
-    ${PN}-directfb \
-    ${PN}-sdl \
-    ${PN}-evas \
-    ${PN}-fb \
-    ${PN}-file \
-    ${PN}-imf-evas \
-    ${PN}-imf \
-    ${PN}-ipc \
-    ${PN}-job \
-    ${PN}-txt \
-    ${PN}-x \
-    ${PN}-input \
-"
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} = "${libdir}/libecore*.so.* \
-    ${bindir} \
-"
-FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
-FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
-FILES_${PN}-desktop = "${libdir}/libecore_desktop*.so.*"
-FILES_${PN}-directfb = "${libdir}/libecore_directfb*.so.*"
-FILES_${PN}-sdl = "${libdir}/libecore_sdl*.so.*"
-FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*"
-FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*"
-FILES_${PN}-file = "${libdir}/libecore_file*.so.*"
-FILES_${PN}-imf = "${libdir}/libecore_imf*.so.* \
-    ${libdir}/ecore/immodules/*.so \
-"
-FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*"
-FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*"
-FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
-FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
-FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
-FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
-
-ECORE_OECONF = "\
-    --x-includes=${STAGING_INCDIR}/X11 \
-    --x-libraries=${STAGING_LIBDIR} \
-    --enable-simple-x11 \
-    --enable-ecore-config \
-    --enable-ecore-x \
-    --enable-ecore-job \
-    --enable-ecore-fb \
-    --enable-ecore-evas \
-    --enable-ecore-evas-software-16-x11 \
-    --enable-ecore-evas-xrender \
-    --enable-abstract-sockets \
-    --enable-ecore-con \
-    --enable-ecore-ipc \
-    --enable-ecore-file \
-    --enable-inotify \
-    --disable-ecore-desktop \
-    --disable-ecore-x-xcb \
-    --disable-ecore-x-xprint \
-    --disable-ecore-directfb \
-    --disable-ecore-sdl \
-    --enable-ecore-evas-opengl-x11 \
-    --disable-ecore-evas-dfb \
-    --disable-ecore-evas-sdl \
-    --disable-openssl \
-    --disable-poll \
-    --enable-xim \
-"
-
-EXTRA_OECONF = "${ECORE_OECONF} \
-                 --enable-curl \
-"
-
-EXTRA_OECONF_virtclass-native = "\
-                 ${ECORE_OECONF} \
-                 --disable-curl \
-                 --disable-ecore-x-composite \
-                 --disable-ecore-x-damage \
-                 --disable-ecore-x-dpms \
-                 --disable-ecore-x-randr \
-                 --disable-ecore-x-render \
-                 --disable-ecore-x-screensaver \
-                 --disable-ecore-x-shape \
-                 --disable-ecore-x-sync \
-                 --disable-ecore-x-xfixes \
-                 --disable-ecore-x-xinerama \
-                 --disable-ecore-x-xprint \
-                 --disable-ecore-x-xtest \
-                 --disable-ecore-x-cursor \
-                 --disable-ecore-x-input \
-                 --disable-ecore-x-dri \
-"
diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.8.bb b/meta-efl/recipes-efl/efl/ecore_1.7.8.bb
index ccd5d97f4..56c682a61 100644
--- a/meta-efl/recipes-efl/efl/ecore_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/ecore_1.7.8.bb
@@ -1,4 +1,116 @@
-require ${BPN}.inc
+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 gnutls \
+           libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxfixes"
+DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
+# optional
+# DEPENDS += "directfb virtual/libsdl openssl virtual/libiconv"
+
+inherit efl gettext
+
+BBCLASSEXTEND = "native"
+
+do_configure_prepend() {
+    touch ${S}/po/Makefile.in.in || true
+    sed -i -e 's: po::g' ${S}/Makefile.am
+}
+
+FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
+
+PACKAGES =+ "\
+    ${PN}-con \
+    ${PN}-config \
+    ${PN}-desktop \
+    ${PN}-directfb \
+    ${PN}-sdl \
+    ${PN}-evas \
+    ${PN}-fb \
+    ${PN}-file \
+    ${PN}-imf-evas \
+    ${PN}-imf \
+    ${PN}-ipc \
+    ${PN}-job \
+    ${PN}-txt \
+    ${PN}-x \
+    ${PN}-input \
+"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+FILES_${PN} = "${libdir}/libecore*.so.* \
+    ${bindir} \
+"
+FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
+FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
+FILES_${PN}-desktop = "${libdir}/libecore_desktop*.so.*"
+FILES_${PN}-directfb = "${libdir}/libecore_directfb*.so.*"
+FILES_${PN}-sdl = "${libdir}/libecore_sdl*.so.*"
+FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*"
+FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*"
+FILES_${PN}-file = "${libdir}/libecore_file*.so.*"
+FILES_${PN}-imf = "${libdir}/libecore_imf*.so.* \
+    ${libdir}/ecore/immodules/*.so \
+"
+FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*"
+FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*"
+FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
+FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
+FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
+FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
+
+ECORE_OECONF = "\
+    --x-includes=${STAGING_INCDIR}/X11 \
+    --x-libraries=${STAGING_LIBDIR} \
+    --enable-simple-x11 \
+    --enable-ecore-config \
+    --enable-ecore-x \
+    --enable-ecore-job \
+    --enable-ecore-fb \
+    --enable-ecore-evas \
+    --enable-ecore-evas-software-16-x11 \
+    --enable-ecore-evas-xrender \
+    --enable-abstract-sockets \
+    --enable-ecore-con \
+    --enable-ecore-ipc \
+    --enable-ecore-file \
+    --enable-inotify \
+    --disable-ecore-desktop \
+    --disable-ecore-x-xcb \
+    --disable-ecore-x-xprint \
+    --disable-ecore-directfb \
+    --disable-ecore-sdl \
+    --enable-ecore-evas-opengl-x11 \
+    --disable-ecore-evas-dfb \
+    --disable-ecore-evas-sdl \
+    --disable-openssl \
+    --disable-poll \
+    --enable-xim \
+"
+
+EXTRA_OECONF = "${ECORE_OECONF} \
+                 --enable-curl \
+"
+
+EXTRA_OECONF_virtclass-native = "\
+                 ${ECORE_OECONF} \
+                 --disable-curl \
+                 --disable-ecore-x-composite \
+                 --disable-ecore-x-damage \
+                 --disable-ecore-x-dpms \
+                 --disable-ecore-x-randr \
+                 --disable-ecore-x-render \
+                 --disable-ecore-x-screensaver \
+                 --disable-ecore-x-shape \
+                 --disable-ecore-x-sync \
+                 --disable-ecore-x-xfixes \
+                 --disable-ecore-x-xinerama \
+                 --disable-ecore-x-xprint \
+                 --disable-ecore-x-xtest \
+                 --disable-ecore-x-cursor \
+                 --disable-ecore-x-input \
+                 --disable-ecore-x-dri \
+"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
deleted file mode 100644
index f421c2bfb..000000000
--- a/meta-efl/recipes-efl/efl/ecore_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-    file://fix-ecore-fb-initialization.patch \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc
deleted file mode 100644
index b34453ce9..000000000
--- a/meta-efl/recipes-efl/efl/edje.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
-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
-LICENSE = "MIT BSD GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
-
-inherit efl
-
-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
-}
-# 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
-}
-
-do_compile_append() {
-    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
-# and a possible source of bugs
-#EXTRA_OECONF = "--enable-edje-program-cache"
-
-# Since r44323 edje has a fixed-point mode
-require edje-fpu.inc
-EXTRA_OECONF += "${@get_edje_fpu_setting(bb, d)}"
-
-SNDFILE = "--enable-sndfile"
-SNDFILE_virtclass-native = "--disable-sndfile"
-SNDFILE_virtclass-nativesdk = "--disable-sndfile"
-EXTRA_OECONF += "${SNDFILE}"
-
-PACKAGES =+ "${PN}-utils"
-RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests"
-
-RRECOMMENDS_${PN}-utils = "\
-    evas-saver-png \
-    evas-saver-jpeg \
-    evas-saver-eet \
-"
-
-DEBIAN_NOAUTONAME_${PN}-utils = "1"
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN}-utils = "\
-    ${bindir}/edje_* \
-    ${bindir}/inkscape2edc \
-    ${libdir}/edje/utils/epp \
-    ${datadir}/edje/include/edje.inc \
-"
-
-FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so \
-                ${datadir}/mime/packages/edje.xml"
-FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la"
-FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.8.bb b/meta-efl/recipes-efl/efl/edje_1.7.8.bb
index ea3fc74e3..ed43c323f 100644
--- a/meta-efl/recipes-efl/efl/edje_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/edje_1.7.8.bb
@@ -1,4 +1,68 @@
-require ${BPN}.inc
+DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
+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
+LICENSE = "MIT BSD GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
+
+inherit efl
+
+BBCLASSEXTEND = "native nativesdk"
+
+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
+}
+# 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
+}
+
+do_compile_append() {
+    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
+# and a possible source of bugs
+#EXTRA_OECONF = "--enable-edje-program-cache"
+
+# Since r44323 edje has a fixed-point mode
+require edje-fpu.inc
+EXTRA_OECONF += "${@get_edje_fpu_setting(bb, d)}"
+
+SNDFILE = "--enable-sndfile"
+SNDFILE_virtclass-native = "--disable-sndfile"
+SNDFILE_virtclass-nativesdk = "--disable-sndfile"
+EXTRA_OECONF += "${SNDFILE}"
+
+PACKAGES =+ "${PN}-utils"
+RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests"
+
+RRECOMMENDS_${PN}-utils = "\
+    evas-saver-png \
+    evas-saver-jpeg \
+    evas-saver-eet \
+"
+
+DEBIAN_NOAUTONAME_${PN}-utils = "1"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+FILES_${PN}-utils = "\
+    ${bindir}/edje_* \
+    ${bindir}/inkscape2edc \
+    ${libdir}/edje/utils/epp \
+    ${datadir}/edje/include/edje.inc \
+"
+
+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"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/edje_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc
deleted file mode 100644
index a7864ec79..000000000
--- a/meta-efl/recipes-efl/efl/eet.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "EET is the Enlightenment data storage library"
-DEPENDS = "pkgconfig zlib jpeg openssl eina gnutls"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
-
-EXTRA_OECONF = "\
-    --enable-openssl \
-    --enable-cypher \
-    --enable-signature \
-    --disable-coverage \
-    --enable-old-eet-file-format \
-    --disable-assert \
-"
-
-PACKAGES =+ "${PN}-utils"
-
-FILES_${PN}-utils = "\
-    ${bindir}/${PN} \
-"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.8.bb b/meta-efl/recipes-efl/efl/eet_1.7.8.bb
index df4d7c175..825897384 100644
--- a/meta-efl/recipes-efl/efl/eet_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/eet_1.7.8.bb
@@ -1,4 +1,26 @@
-require ${BPN}.inc
+DESCRIPTION = "EET is the Enlightenment data storage library"
+DEPENDS = "pkgconfig zlib jpeg openssl eina gnutls"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
+
+inherit efl
+
+BBCLASSEXTEND = "native"
+
+EXTRA_OECONF = "\
+    --enable-openssl \
+    --enable-cypher \
+    --enable-signature \
+    --disable-coverage \
+    --enable-old-eet-file-format \
+    --disable-assert \
+"
+
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-utils = "\
+    ${bindir}/${PN} \
+"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/eet_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/eeze.inc b/meta-efl/recipes-efl/efl/eeze.inc
deleted file mode 100644
index 5d523c991..000000000
--- a/meta-efl/recipes-efl/efl/eeze.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Eeze is a library to simplify the use of devices"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=315521fe061b6fd4290ef01db714a3c8"
-DEPENDS = "ecore eet udev"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "${libdir}/enlightenment/utils/eeze_scanner"
-FILES_${PN}-dbg += "${libdir}/enlightenment/utils/.debug"
-
-RRECOMMENDS_${PN} += "eject"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.8.bb b/meta-efl/recipes-efl/efl/eeze_1.7.8.bb
index bcf1c0413..f081f3343 100644
--- a/meta-efl/recipes-efl/efl/eeze_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/eeze_1.7.8.bb
@@ -1,4 +1,19 @@
-require ${BPN}.inc
+DESCRIPTION = "Eeze is a library to simplify the use of devices"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=315521fe061b6fd4290ef01db714a3c8"
+DEPENDS = "ecore eet udev"
+
+inherit efl
+
+BBCLASSEXTEND = "native"
+
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+FILES_${PN} += "${libdir}/enlightenment/utils/eeze_scanner"
+FILES_${PN}-dbg += "${libdir}/enlightenment/utils/.debug"
+
+RRECOMMENDS_${PN} += "eject"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/eeze_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/efreet.inc b/meta-efl/recipes-efl/efl/efreet.inc
deleted file mode 100644
index 6c6852606..000000000
--- a/meta-efl/recipes-efl/efl/efreet.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "The Enlightenment freedesktop.org library"
-DEPENDS = "ecore"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
-
-inherit efl gettext
-
-INC_PR = "r0"
-
-PACKAGES =+ "${PN}-mime ${PN}-trash"
-FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
-FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*"
-
-# efreet_desktop_cache_create is needed for e-wm start, don't include it in -tests
-FILES_${PN} += "${libdir}/efreet/efreet_desktop_cache_create \
-                ${libdir}/efreet/efreet_icon_cache_create \
-"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.8.bb b/meta-efl/recipes-efl/efl/efreet_1.7.8.bb
index d1eadb7bf..e7abdaa0b 100644
--- a/meta-efl/recipes-efl/efl/efreet_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/efreet_1.7.8.bb
@@ -1,4 +1,18 @@
-require ${BPN}.inc
+DESCRIPTION = "The Enlightenment freedesktop.org library"
+DEPENDS = "ecore"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
+
+inherit efl gettext
+
+PACKAGES =+ "${PN}-mime ${PN}-trash"
+FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
+FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*"
+
+# efreet_desktop_cache_create is needed for e-wm start, don't include it in -tests
+FILES_${PN} += "${libdir}/efreet/efreet_desktop_cache_create \
+                ${libdir}/efreet/efreet_icon_cache_create \
+"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/efreet_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/eina.inc b/meta-efl/recipes-efl/efl/eina.inc
deleted file mode 100644
index 4a77de3aa..000000000
--- a/meta-efl/recipes-efl/efl/eina.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Eina is the Enlightenment data library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9cc092d35d7bbfcd986232cde130a551"
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
-
-inherit efl
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "${libdir}/eina"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.8.bb b/meta-efl/recipes-efl/efl/eina_1.7.8.bb
index 04f16c4d5..68a666726 100644
--- a/meta-efl/recipes-efl/efl/eina_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/eina_1.7.8.bb
@@ -1,4 +1,15 @@
-require ${BPN}.inc
+DESCRIPTION = "Eina is the Enlightenment data library"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9cc092d35d7bbfcd986232cde130a551"
+
+BBCLASSEXTEND = "native"
+
+inherit efl
+
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+FILES_${PN} += "${libdir}/eina"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/eina_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/eio.inc b/meta-efl/recipes-efl/efl/eio.inc
deleted file mode 100644
index 4d28faba1..000000000
--- a/meta-efl/recipes-efl/efl/eio.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Enlightenment Input Output Library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=180fca752525726bd6ba021689509a08"
-DEPENDS = "ecore eina"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.8.bb b/meta-efl/recipes-efl/efl/eio_1.7.8.bb
index 9634459fc..f5827da64 100644
--- a/meta-efl/recipes-efl/efl/eio_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/eio_1.7.8.bb
@@ -1,4 +1,11 @@
-require ${BPN}.inc
+DESCRIPTION = "Enlightenment Input Output Library"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=180fca752525726bd6ba021689509a08"
+DEPENDS = "ecore eina"
+
+inherit efl
+
+BBCLASSEXTEND = "native"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/eio_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/embryo.inc b/meta-efl/recipes-efl/efl/embryo.inc
deleted file mode 100644
index 7997a5f4e..000000000
--- a/meta-efl/recipes-efl/efl/embryo.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
-
-inherit efl
-
-LICENSE = "MIT BSD CompuPhase"
-LIC_FILES_CHKSUM = "file://COPYING;md5=220a7f1107df42c62428d8ebe559ed14"
-
-BBCLASSEXTEND = "native"
-INC_PR = "r0"
-
-DEPENDS += "eina"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.8.bb b/meta-efl/recipes-efl/efl/embryo_1.7.8.bb
index 3f1e88329..c4dfbca70 100644
--- a/meta-efl/recipes-efl/efl/embryo_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/embryo_1.7.8.bb
@@ -1,4 +1,16 @@
-require ${BPN}.inc
+DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
+
+inherit efl
+
+LICENSE = "MIT BSD CompuPhase"
+LIC_FILES_CHKSUM = "file://COPYING;md5=220a7f1107df42c62428d8ebe559ed14"
+
+BBCLASSEXTEND = "native"
+
+DEPENDS += "eina"
+
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/embryo_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/emotion.inc b/meta-efl/recipes-efl/efl/emotion.inc
deleted file mode 100644
index a4ef02d16..000000000
--- a/meta-efl/recipes-efl/efl/emotion.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-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 eio"
-
-INC_PR = "r2"
-
-inherit efl
-
-EXTRA_OECONF = "--disable-xine --disable-generic-vlc --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-PACKAGES =+ "emotion-backend-gstreamer"
-FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
-# upgrade path from libemotion0 to libemotion1
-RREPLACES_${PN} = "libemotion0"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.8.bb b/meta-efl/recipes-efl/efl/emotion_1.7.8.bb
index b5177d4af..c6eae15a2 100644
--- a/meta-efl/recipes-efl/efl/emotion_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/emotion_1.7.8.bb
@@ -1,4 +1,18 @@
-require ${BPN}.inc
+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 eio"
+
+inherit efl
+
+EXTRA_OECONF = "--disable-xine --disable-generic-vlc --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+PACKAGES =+ "emotion-backend-gstreamer"
+FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
+# upgrade path from libemotion0 to libemotion1
+RREPLACES_${PN} = "libemotion0"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/emotion_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/ethumb.inc b/meta-efl/recipes-efl/efl/ethumb.inc
deleted file mode 100644
index 32a130650..000000000
--- a/meta-efl/recipes-efl/efl/ethumb.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "EFL based thumbnail generation library"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c"
-DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf"
-
-INC_PR = "r0"
-
-inherit efl
-
-EXTRA_OECONF = "\
-    --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-    --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
-    --disable-docs \
-"
-
-# Some upgrade path tweaking, as in evas
-AUTO_LIBNAME_PKGS = ""
-
-FILES_${PN} += "\
-    ${bindir}/ethumbd \
-    ${libexecdir}/ethumbd_slave \
-"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb
index 8d7d8bde4..1d3632249 100644
--- a/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/ethumb_1.7.8.bb
@@ -1,4 +1,23 @@
-require ${BPN}.inc
+DESCRIPTION = "EFL based thumbnail generation library"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c"
+DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf"
+
+inherit efl
+
+EXTRA_OECONF = "\
+    --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+    --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+    --disable-docs \
+"
+
+# Some upgrade path tweaking, as in evas
+AUTO_LIBNAME_PKGS = ""
+
+FILES_${PN} += "\
+    ${bindir}/ethumbd \
+    ${libexecdir}/ethumbd_slave \
+"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/ethumb_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc
deleted file mode 100644
index 4e5e1e306..000000000
--- a/meta-efl/recipes-efl/efl/evas.inc
+++ /dev/null
@@ -1,168 +0,0 @@
-DESCRIPTION = "Evas is the Enlightenment canvas API"
-LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b9b25b03d63aa496552658c7e78b11a1"
-# can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "librsvg eina eet freetype jpeg libpng tiff virtual/libx11 libxext libxrender fontconfig libfribidi giflib"
-DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native eet-native eina-native libfribidi-native"
-
-inherit efl
-
-BBCLASSEXTEND = "native"
-INC_PR = "r1"
-FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
-
-python populate_packages_prepend () {
-    for plugin_type in "engines loaders savers".split():
-        bb.note( "splitting packages for evas %s..." % plugin_type )
-        basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type)
-
-        do_split_packages(d, basedir, '^(.*)',
-        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 = d.expand( '${libdir}/evas/%s/loaders' % plugin_type)
-
-        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() {
-    find "${D}" -name .debug -type d -exec rm -rf {} \;
-}
-
-FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/loaders/*/*/.debug/"
-FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
-
-PACKAGES += "${PN}-cserve2"
-PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
-
-# 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 \
-    evas-engine-software-x11 \
-    evas-engine-software-16 \
-    evas-engine-software-16-x11 \
-    evas-engine-xrender-x11 \
-    \
-    evas-loader-png \
-    evas-loader-jpeg \
-    evas-loader-gif \
-    evas-loader-svg \
-"
-
-# Some upgrade path tweaking
-AUTO_LIBNAME_PKGS = ""
-
-EVAS_CPU_TWEAKS = ""
-# Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194
-EVAS_CPU_TWEAKS_armv7a = "--disable-cpu-neon"
-
-# common options
-EVAS_OECONF = " \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} \
-                --enable-evas-magic-debug \
-                --enable-fb \
-                --disable-directfb \
-                --disable-sdl \
-                --enable-buffer=static \
-                --enable-static-software-generic \
-                --disable-software-ddraw \
-                --disable-software-qtopia \
-                --disable-software-xcb \
-                --disable-xrender-xcb \
-                --disable-glitz-x11 \
-                --enable-image-loader-eet=static \
-                --disable-image-loader-edb \
-                --enable-image-loader-png \
-                --enable-image-loader-jpeg \
-                --enable-image-loader-tiff \
-                --enable-image-loader-xpm \
-                --enable-cpu-c \
-                --enable-fontconfig \
-                --enable-font-loader-eet \
-                --enable-scale-sample \
-                --enable-scale-smooth \
-                --enable-convert-yuv \
-                --enable-small-dither-mask \
-                --disable-no-dither-mask \
-                --disable-convert-8-rgb-332 \
-                --disable-convert-8-rgb-666 \
-                --disable-convert-8-rgb-232 \
-                --disable-convert-8-rgb-222 \
-                --disable-convert-8-rgb-221 \
-                --disable-convert-8-rgb-121 \
-                --disable-convert-8-rgb-111 \
-                --enable-convert-16-rgb-565 \
-                --disable-convert-16-rgb-555 \
-                --disable-convert-16-rgb-444 \
-                --disable-convert-16-rgb-ipq \
-                --enable-convert-16-rgb-rot-0 \
-                --enable-convert-16-rgb-rot-90 \
-                --disable-convert-16-rgb-rot-180 \
-                --enable-convert-16-rgb-rot-270 \
-"
-
-# either sgx or 6410 atm
-GLES ?= "sgx"
-
-# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
-# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
-
-# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
-
-EXTRA_OECONF = "${EVAS_OECONF} \
-                ${EVAS_CPU_TWEAKS} \
-                --enable-pthreads \
-                --enable-async-events \
-                --enable-async-preload \
-                --enable-simple-x11 \
-                --enable-software-x11 \
-                --enable-xrender-x11 \
-                --enable-software-16-x11 \
-                --enable-image-loader-gif \
-                --enable-image-loader-svg \
-                --enable-convert-24-rgb-888 \
-                --enable-convert-24-bgr-888 \
-                --enable-convert-32-rgb-8888 \
-                --enable-convert-32-rgbx-8888 \
-                --enable-convert-32-bgr-8888 \
-                --enable-convert-32-bgrx-8888 \
-                --enable-convert-32-rgb-rot-0 \
-                --enable-convert-32-rgb-rot-90 \
-                --disable-convert-32-rgb-rot-180 \
-                --enable-convert-32-rgb-rot-270 \
-                --enable-gl-x11 \
-                --enable-gl-xlib \
-                --enable-gl-flavor-gles \
-                --enable-gles-variety-${GLES} \
-"
-EXTRA_OECONF_virtclass-native = "${EVAS_OECONF} \
-                --disable-software-x11 \
-                --disable-software-16-x11 \
-                --disable-gl-x11 \
-                --disable-gl-xlib \
-                --disable-xrender-x11 \
-                --disable-image-loader-gif \
-                --disable-image-loader-svg \
-                --disable-convert-24-rgb-888 \
-                --disable-convert-24-bgr-888 \
-                --disable-convert-32-rgb-8888 \
-                --disable-convert-32-rgbx-8888 \
-                --disable-convert-32-bgr-8888 \
-                --disable-convert-32-bgrx-8888 \
-                --disable-convert-32-rgb-rot-0 \
-                --disable-convert-32-rgb-rot-90 \
-                --disable-convert-32-rgb-rot-270 \
-"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.8.bb b/meta-efl/recipes-efl/efl/evas_1.7.8.bb
index f9bf8d038..5f2bf78cb 100644
--- a/meta-efl/recipes-efl/efl/evas_1.7.8.bb
+++ b/meta-efl/recipes-efl/efl/evas_1.7.8.bb
@@ -1,4 +1,170 @@
-require ${BPN}.inc
+DESCRIPTION = "Evas is the Enlightenment canvas API"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b9b25b03d63aa496552658c7e78b11a1"
+# can also depend on valgrind, libsdl-x11, directfb
+DEPENDS = "librsvg eina eet freetype jpeg libpng tiff virtual/libx11 libxext libxrender fontconfig libfribidi giflib"
+DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native eet-native eina-native libfribidi-native"
+
+inherit efl
+
+BBCLASSEXTEND = "native"
+FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
+
+python populate_packages_prepend () {
+    for plugin_type in "engines loaders savers".split():
+        bb.note( "splitting packages for evas %s..." % plugin_type )
+        basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type)
+
+        do_split_packages(d, basedir, '^(.*)',
+        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 = d.expand( '${libdir}/evas/%s/loaders' % plugin_type)
+
+        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() {
+    find "${D}" -name .debug -type d -exec rm -rf {} \;
+}
+
+FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
+FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/loaders/*/*/.debug/"
+FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
+
+PACKAGES += "${PN}-cserve2"
+PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve2-.*"
+
+# 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 \
+    evas-engine-software-x11 \
+    evas-engine-software-16 \
+    evas-engine-software-16-x11 \
+    evas-engine-xrender-x11 \
+    \
+    evas-loader-png \
+    evas-loader-jpeg \
+    evas-loader-gif \
+    evas-loader-svg \
+"
+
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+EVAS_CPU_TWEAKS = ""
+# Disabled for now, see http://thread.gmane.org/gmane.comp.window-managers.enlightenment.devel/25194
+EVAS_CPU_TWEAKS_armv7a = "--disable-cpu-neon"
+
+# common options
+EVAS_OECONF = " \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+                --enable-evas-magic-debug \
+                --enable-fb \
+                --disable-directfb \
+                --disable-sdl \
+                --enable-buffer=static \
+                --enable-static-software-generic \
+                --disable-software-ddraw \
+                --disable-software-qtopia \
+                --disable-software-xcb \
+                --disable-xrender-xcb \
+                --disable-glitz-x11 \
+                --enable-image-loader-eet=static \
+                --disable-image-loader-edb \
+                --enable-image-loader-png \
+                --enable-image-loader-jpeg \
+                --enable-image-loader-tiff \
+                --enable-image-loader-xpm \
+                --enable-cpu-c \
+                --enable-fontconfig \
+                --enable-font-loader-eet \
+                --enable-scale-sample \
+                --enable-scale-smooth \
+                --enable-convert-yuv \
+                --enable-small-dither-mask \
+                --disable-no-dither-mask \
+                --disable-convert-8-rgb-332 \
+                --disable-convert-8-rgb-666 \
+                --disable-convert-8-rgb-232 \
+                --disable-convert-8-rgb-222 \
+                --disable-convert-8-rgb-221 \
+                --disable-convert-8-rgb-121 \
+                --disable-convert-8-rgb-111 \
+                --enable-convert-16-rgb-565 \
+                --disable-convert-16-rgb-555 \
+                --disable-convert-16-rgb-444 \
+                --disable-convert-16-rgb-ipq \
+                --enable-convert-16-rgb-rot-0 \
+                --enable-convert-16-rgb-rot-90 \
+                --disable-convert-16-rgb-rot-180 \
+                --enable-convert-16-rgb-rot-270 \
+"
+
+# either sgx or 6410 atm
+GLES ?= "sgx"
+
+# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
+# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
+
+# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
+
+EXTRA_OECONF = "${EVAS_OECONF} \
+                ${EVAS_CPU_TWEAKS} \
+                --enable-pthreads \
+                --enable-async-events \
+                --enable-async-preload \
+                --enable-simple-x11 \
+                --enable-software-x11 \
+                --enable-xrender-x11 \
+                --enable-software-16-x11 \
+                --enable-image-loader-gif \
+                --enable-image-loader-svg \
+                --enable-convert-24-rgb-888 \
+                --enable-convert-24-bgr-888 \
+                --enable-convert-32-rgb-8888 \
+                --enable-convert-32-rgbx-8888 \
+                --enable-convert-32-bgr-8888 \
+                --enable-convert-32-bgrx-8888 \
+                --enable-convert-32-rgb-rot-0 \
+                --enable-convert-32-rgb-rot-90 \
+                --disable-convert-32-rgb-rot-180 \
+                --enable-convert-32-rgb-rot-270 \
+                --enable-gl-x11 \
+                --enable-gl-xlib \
+                --enable-gl-flavor-gles \
+                --enable-gles-variety-${GLES} \
+"
+EXTRA_OECONF_virtclass-native = "${EVAS_OECONF} \
+                --disable-software-x11 \
+                --disable-software-16-x11 \
+                --disable-gl-x11 \
+                --disable-gl-xlib \
+                --disable-xrender-x11 \
+                --disable-image-loader-gif \
+                --disable-image-loader-svg \
+                --disable-convert-24-rgb-888 \
+                --disable-convert-24-bgr-888 \
+                --disable-convert-32-rgb-8888 \
+                --disable-convert-32-rgbx-8888 \
+                --disable-convert-32-bgr-8888 \
+                --disable-convert-32-bgrx-8888 \
+                --disable-convert-32-rgb-rot-0 \
+                --disable-convert-32-rgb-rot-90 \
+                --disable-convert-32-rgb-rot-270 \
+"
 
 SRC_URI = "\
     ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb
deleted file mode 100644
index 5b13b9e7b..000000000
--- a/meta-efl/recipes-efl/efl/evas_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require ${BPN}.inc
-
-SRCREV = "${EFL_SRCREV}"
-PV = "1.7.4+svnr${SRCPV}"
-PR = "${INC_PR}.0"
-DEFAULT_PREFERENCE = "-1"
-
-SRCNAME_append = "-1.7"
-
-SRC_URI = "\
-    ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \
-"
-S = "${WORKDIR}/${SRCNAME}"