34 files changed, 152 insertions, 164 deletions
diff --git a/packages/efl1/ecore-native_0.9.9.038.bb b/packages/efl1/ecore-native_cvs.bb
index 8026adb49c..92a30397e1 100644
--- a/packages/efl1/ecore-native_0.9.9.038.bb
+++ b/packages/efl1/ecore-native_cvs.bb
@@ -1,14 +1,15 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
                 --disable-ecore-x-xcb \
                 --disable-ecore-x \
                 --enable-ecore-job \
-                --enable-ecore-directfb \
+                --disable-ecore-directfb \
+                --disable-ecore-sdl \
                 --enable-ecore-fb \
                 --enable-ecore-evas \
                 --disable-ecore-evas-gl \
@@ -18,7 +19,6 @@ EXTRA_OECONF = "\
                 --enable-abstract-sockets \
                 --enable-ecore-con \
                 --enable-ecore-ipc \
-                --enable-ecore-dbus \
                 --enable-ecore-file \
                 --enable-inotify \
                 --disable-poll \
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index fcf7292622..9e1bc18f5c 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -2,31 +2,26 @@ DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
 foundation libraries. It makes makes doing selections, drag and drop, event loops, \
 timeouts and idle handlers fast, optimized, and convenient."
 LICENSE = "MIT"
-DEPENDS = "curl dbus directfb eet evas tslib"
+DEPENDS = "curl directfb eet evas tslib"
 # optional
 # DEPENDS += "openssl virtual/libiconv"
+PV = "0.9.9+cvs${SRCDATE}"
 
-inherit efl1
+inherit efl_library
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
-           file://configure-abstract-sockets.patch;patch=1 \
-           file://fix-tslib-configure.patch;patch=1  \
-           file://fix-directfb-include.patch;patch=1"
+SRC_URI += "\
+           file://fix-tslib-configure.patch;patch=1 \
+           file://fix-directfb-include.patch;patch=1 \
+"
 
-S = "${WORKDIR}/ecore-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
-
-do_stage() {
-    autotools_stage_all
-}
-
 PACKAGES += "\
     ${PN}-con \
     ${PN}-config \
-    ${PN}-dbus \
     ${PN}-desktop \
     ${PN}-directfb \
+    ${PN}-sdl \
     ${PN}-evas \
     ${PN}-fb \
     ${PN}-file \
@@ -38,9 +33,9 @@ PACKAGES += "\
 FILES_${PN} = "${libdir}/libecore.so.*"
 FILES_${PN}-con = "${libdir}/libecore_con.so.*"
 FILES_${PN}-config = "${libdir}/libecore_config.so.*"
-FILES_${PN}-dbus = "${libdir}/libecore_dbus.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.*"
@@ -48,4 +43,3 @@ 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.*"
-
diff --git a/packages/efl1/ecore/configure-abstract-sockets.patch b/packages/efl1/ecore/configure-abstract-sockets.patch
deleted file mode 100644
index 359203b163..0000000000
--- a/packages/efl1/ecore/configure-abstract-sockets.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ecore-0.9.9.038/configure.in
-===================================================================
---- ecore-0.9.9.038.orig/configure.in
-+++ ecore-0.9.9.038/configure.in
-@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets,
-   [ want_abstract_sockets="yes"]
- )
- if test "x$want_abstract_sockets" = "xyes"; then
--  AC_ABSTRACT_SOCKET_TEST(
--    [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])],
--    []
--  )
-+  HAVE_ABSTRACT_SOCKETS = 1
- fi
- 
- ECORE_CHECK_MODULE([Con], [yes])
diff --git a/packages/efl1/ecore_0.9.9.038.bb b/packages/efl1/ecore_cvs.bb
index 57ab7ce9fb..dd6c467c54 100644
--- a/packages/efl1/ecore_0.9.9.038.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF = "\
 		--enable-ecore-txt \
@@ -7,6 +7,7 @@ EXTRA_OECONF = "\
 		--enable-ecore-x \
 		--enable-ecore-job \
 		--enable-ecore-directfb \
+		--enable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
 		--disable-ecore-evas-gl \
@@ -16,7 +17,6 @@ EXTRA_OECONF = "\
 		--enable-abstract-sockets \
 		--enable-ecore-con \
 		--enable-ecore-ipc \
-		--enable-ecore-dbus \
 		--enable-ecore-file \
 		--enable-inotify \
 		--disable-poll \
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 365f857e1c..b7c85e8663 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -2,13 +2,4 @@ DESCRIPTION = "Edb is a database library"
 LICENSE = "MIT"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl1
-
-SRC_URI = "${E_CVS};module=e17/libs/edb"
-S = "${WORKDIR}/edb"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN} = "${libdir}/*.so*"
-
+inherit efl_library
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
new file mode 100644
index 0000000000..db1547c3d4
--- /dev/null
+++ b/packages/efl1/edbus_cvs.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
+DEPENDS = "dbus ecore"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl_library
+
+SRC_URI = "${E_CVS};module=e17/proto/e_dbus"
+S = "${WORKDIR}/e_dbus"
+
+# TODO increase package granularity
+
diff --git a/packages/efl1/edje-native_0.5.0.040.bb b/packages/efl1/edje-native_cvs.bb
index 8f3ef51fa7..2c52b69a0c 100644
--- a/packages/efl1/edje-native_0.5.0.040.bb
+++ b/packages/efl1/edje-native_cvs.bb
@@ -1,6 +1,6 @@
 require edje_${PV}.bb
 inherit native
-PR = "r4"
+PR = "r0"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
@@ -10,7 +10,3 @@ do_configure_prepend() {
 	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
 }
-
-do_stage_append() {
-	efl_stage_bin
-}
diff --git a/packages/efl1/edje_0.5.0.040.bb b/packages/efl1/edje_0.5.0.040.bb
deleted file mode 100644
index 7db9951e8d..0000000000
--- a/packages/efl1/edje_0.5.0.040.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
-DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
-PR = "r7"
-
-inherit efl1 lib_package
-
-SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
-
-do_configure_prepend() {
-	install -d "${S}/m4"
-	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-	aclocal -I m4
-}
-
-FILES_${PN}-dev =+ "${bindir} ${datadir}"
-FILES_${PN}-examples = ""
-FILES_${PN}-bin = ""
-
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
new file mode 100644
index 0000000000..79336b74b5
--- /dev/null
+++ b/packages/efl1/edje_cvs.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+# can also install vim data files
+DEPENDS = "eet evas ecore embryo edje-native"
+LICENSE = "MIT"
+PV = "0.5.0+cvs${SRCDATE}"
+PR = "r0"
+
+inherit efl_library
+
+# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
+
diff --git a/packages/efl1/eet-native_0.9.10.040.bb b/packages/efl1/eet-native_cvs.bb
index 9e2426ca9f..de162df5d5 100644
--- a/packages/efl1/eet-native_0.9.10.040.bb
+++ b/packages/efl1/eet-native_cvs.bb
@@ -1,4 +1,3 @@
-require eet_${PV}.bb
+require eet_cvs.bb
 inherit native
 DEPENDS = "zlib-native jpeg-native"
-
diff --git a/packages/efl1/eet_0.9.10.040.bb b/packages/efl1/eet_cvs.bb
index cbe1f304fe..2c9c641b6c 100644
--- a/packages/efl1/eet_0.9.10.040.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -4,6 +4,7 @@ each chunk (very much like a zip file) and allow fast \
 random-access reading of the file later on."
 DEPENDS = "zlib jpeg"
 LICENSE = "BSD"
+PV = "0.9.10+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl1
+inherit efl_library
diff --git a/packages/efl1/efreet_0.0.3.005.bb b/packages/efl1/efreet_cvs.bb
index b387ee89a0..dba9a3c9fb 100644
--- a/packages/efl1/efreet_0.0.3.005.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -2,9 +2,11 @@ DESCRIPTION = "An implementation of freedesktop.org specs for the \
 Enlightenment Foundation Libraries"
 DEPENDS = "ecore"
 LICENSE = "BSD"
+PV = "0.0.3+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl1
+inherit efl_library
+
+PACKAGES =+ "${PN}-mime"
+FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
 
-PACKAGES =+ "efreet-tests"
-FILES_efreet-tests = "${bindir}/*_* ${datadir}"
diff --git a/packages/efl1/embryo-native_0.9.1.040.bb b/packages/efl1/embryo-native_cvs.bb
index 2fc3faddfd..2fc3faddfd 100644
--- a/packages/efl1/embryo-native_0.9.1.040.bb
+++ b/packages/efl1/embryo-native_cvs.bb
diff --git a/packages/efl1/embryo_0.9.1.040.bb b/packages/efl1/embryo_cvs.bb
index 0728ef563b..45b75f503d 100644
--- a/packages/efl1/embryo_0.9.1.040.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -4,8 +4,7 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
 Embryo allows scripting capabilities in places that otherwise wouldn't support \
 basic programming structures such as in Edje EDCs."
 LICENSE = "MIT"
+PV = "0.9.1+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl1 lib_package
-
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
+inherit efl_library
diff --git a/packages/efl1/emotion_0.0.1.007.bb b/packages/efl1/emotion_cvs.bb
index 2a65d17220..84302e4793 100644
--- a/packages/efl1/emotion_0.0.1.007.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -3,9 +3,10 @@ LICENSE = "MIT"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
 RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
+PV = "0.0.1+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl1
+inherit efl_library
 
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb
index 169ba856a7..689e254fc1 100644
--- a/packages/efl1/engrave_cvs.bb
+++ b/packages/efl1/engrave_cvs.bb
@@ -4,13 +4,4 @@ LICENSE = "MIT"
 DEPENDS = "evas ecore"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl1
-
-SRC_URI = "${E_CVS};module=e17/libs/engrave"
-S = "${WORKDIR}/engrave"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN} = "${libdir}/*.so*"
-
+inherit efl_library
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb
index 8e30cf0033..728beb61ec 100644
--- a/packages/efl1/enhance_cvs.bb
+++ b/packages/efl1/enhance_cvs.bb
@@ -3,13 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "exml"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl1
-
-SRC_URI = "${E_CVS};module=e17/libs/enhance"
-S = "${WORKDIR}/enhance"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN} = "${libdir}/*.so*"
-
+inherit efl_library
diff --git a/packages/efl1/epdf/.mtn2git_empty b/packages/efl1/epdf/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/efl1/epdf/.mtn2git_empty
diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch
new file mode 100644
index 0000000000..dd5469c286
--- /dev/null
+++ b/packages/efl1/epdf/fix-plugin-path-check.patch
@@ -0,0 +1,24 @@
+Index: epdf/configure.in
+===================================================================
+--- epdf.orig/configure.in
++++ epdf/configure.in
+@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
+   [
+    have_ewl="yes"
+    requirements="$requirements ewl"
+-   EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+-   EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++   EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++   EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+    AC_SUBST(EWL_TEST_LIBS_DIR)
+    AC_SUBST(EWL_TEST_SOURCE_DIR)
+   ],
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
+   [
+    have_epsilon="yes"
+    requirements="$requirements epsilon imlib2"
+-   EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
++   EPSILON_PLUGINS_DIR="/usr/lib/epsilon/plugins/"
+    AC_SUBST(EPSILON_PLUGINS_DIR)
+   ],
+   [
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index d9206dc4e4..2681b941d2 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -1,15 +1,22 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "BSD"
-DEPENDS = "poppler evas ecore etk ewl"
+DEPENDS = "poppler0.6 evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 
-inherit efl1
+inherit efl_library
 
-SRC_URI = "${E_CVS};module=e17/proto/epdf"
-S = "${WORKDIR}/epdf"
+SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
+           file://fix-plugin-path-check.patch;HACK=1;patch=1"
 
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN} = "${libdir}/*.so*"
+# add ewl additions
+FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la"
+FILES_${PN}-dbg += "${libdir}/ewl/tests/.debug"
+
+# add epsilon additions
+FILES_${PN}-dev += "${libdir}/epsilon/plugins/epdf_thumbnailer.a ${libdir}/epsilon/plugins/epdf_thumbnailer.la"
+FILES_${PN}-dbg += "${libdir}/epsilon/plugins/.debug"
+
+PACKAGES += "${PN}-ewl-widget epsilon-plugin-${PN}"
+FILES_${PN}-ewl-widget = "${libdir}/ewl/tests/libewl_pdf*.so*"
+FILES_epsilon-plugin-${PN} = "${libdir}/epsilon/plugins/epdf_thumbnailer.so*"
 
diff --git a/packages/efl1/epeg_0.9.0.010.bb b/packages/efl1/epeg_cvs.bb
index 6a99269291..3991dd3d21 100644
--- a/packages/efl1/epeg_0.9.0.010.bb
+++ b/packages/efl1/epeg_cvs.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Epeg is a small library for handling thumbnails."
 LICENSE = "MIT"
 DEPENDS = "jpeg"
+PV = "0.9.0+cvs${SRCDATE}"
+PR = "r0"
 
-inherit efl1
-
-FILES_${PN} = "${libdir}/lib*.so*"
-FILES_${PN}-dev += "${bindir}/*-config"
+inherit efl_library
diff --git a/packages/efl1/epsilon_0.3.0.010.bb b/packages/efl1/epsilon_0.3.0.010.bb
deleted file mode 100644
index ffda151f8b..0000000000
--- a/packages/efl1/epsilon_0.3.0.010.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
-that is compliant with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "BSD"
-# can also depend on xine for movie thumbnails
-DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
-PR = "r1"
-
-inherit efl1
-
-PACKAGES =+ "epsilon-tests"
-FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN} = "${libdir}/lib*.so*"
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 4199288115..be2934dec8 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -2,16 +2,13 @@ DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
 that is compliant with the freedesktop.org Thumbnail Managing Standard."
 LICENSE = "BSD"
 # can also depend on xine for movie thumbnails
-DEPENDS = "imlib2 epeg epdf libpng evas ecore edje perl-native"
-PV = "0.3.0.009+cvs${SRCDATE}"
+DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
+PV = "0.3.0+cvs${SRCDATE}"
 
-inherit efl1
+inherit efl_library
 
-SRC_URI = "${E_CVS};module=e17/libs/epsilon"
-S = "${WORKDIR}/epsilon"
+# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
+EXTRA_OECONF = "--disable-xine"
 
-PACKAGES =+ "epsilon-tests"
-FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN} = "${libdir}/lib*.so* ${libdir}/${PN}/plugins/*.so"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
 FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug/*.so"
diff --git a/packages/efl1/esmart_0.9.0.010.bb b/packages/efl1/esmart_cvs.bb
index 928a8c1afd..c56ad891ea 100644
--- a/packages/efl1/esmart_0.9.0.010.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
+PV = "0.9.0+cvs${SRCDATE}"
 
-inherit efl1
-
-S = "${WORKDIR}/esmart-${PV}"
+inherit efl_library
 
 PACKAGES =+ "${PN}-textentry \
              ${PN}-thumb \
@@ -13,6 +12,7 @@ PACKAGES =+ "${PN}-textentry \
              ${PN}-file-dialog \
              ${PN}-draggies \
              ${PN}-trans-x11"
+
 FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/"
 FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*"
 FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*"
diff --git a/packages/efl1/etk_0.1.0.004.bb b/packages/efl1/etk_cvs.bb
index c693f17ce5..ad959edef6 100644
--- a/packages/efl1/etk_0.1.0.004.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -1,9 +1,12 @@
 DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
-PR = "r2"
+PV = "0.1.0+cvs${SRCDATE}"
+PR = "r0"
 
-inherit efl1
+inherit efl_library
+
+# TODO package engines seperatly (do_split_packages)
 
 PACKAGES =+ "etk-engines"
 FILES_${PN} = "${libdir}/libetk.so*"
diff --git a/packages/efl1/evas-native_0.9.9.040.bb b/packages/efl1/evas-native_cvs.bb
index e79695c1f2..8b8694899e 100644
--- a/packages/efl1/evas-native_0.9.9.040.bb
+++ b/packages/efl1/evas-native_cvs.bb
@@ -1,13 +1,14 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r9"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
-		--disable-fb					\
+		--disable-fb				\
 		--disable-directfb			\
+		--disable-sdl				\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index c631b26eb1..6fb6d7f60e 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -4,15 +4,14 @@ down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
 # can also depend on valgrind (?)
-DEPENDS = "directfb eet freetype jpeg virtual/libx11 libxext"
+DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext"
+PV = "0.9.9+cvs${SRCDATE}"
 
-inherit efl1
+inherit efl_library
 
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 SRC_URI += "file://fix-configure.patch;patch=1"
-
-S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
@@ -25,7 +24,7 @@ python populate_packages_prepend () {
             do_split_packages(d, basedir, '^(.*)',
             output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
             description = 'Evas module %s',
-            allow_dirs=True, recursive=False )
+            allow_dirs=True, recursive=False, extra_depends="" )
 }
 
 do_install_append() {
diff --git a/packages/efl1/evas_0.9.9.040.bb b/packages/efl1/evas_cvs.bb
index 706a152764..b80ff8bcba 100644
--- a/packages/efl1/evas_0.9.9.040.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,11 +1,12 @@
 require evas.inc
-PR = "r9"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb					\
 		--enable-directfb			\
+		--enable-sdl				\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
diff --git a/packages/efl1/evolve-native_cvs.bb b/packages/efl1/evolve-native_cvs.bb
new file mode 100644
index 0000000000..8478b6b0d8
--- /dev/null
+++ b/packages/efl1/evolve-native_cvs.bb
@@ -0,0 +1,6 @@
+require evolve_cvs.bb
+inherit native
+DEPENDS = "etk-native"
+
+# needs ecore-x :/
+BROKEN = "1"
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb
new file mode 100644
index 0000000000..272d90002e
--- /dev/null
+++ b/packages/efl1/evolve_cvs.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language"
+LICENSE = "MIT"
+DEPENDS = "etk evolve-native"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit efl_library
diff --git a/packages/efl1/ewl_0.5.1.010.bb b/packages/efl1/ewl_0.5.1.010.bb
deleted file mode 100644
index cece54b7d1..0000000000
--- a/packages/efl1/ewl_0.5.1.010.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library \
-based on the enlightenment foundation libraries."
-DEPENDS = "evas ecore edje emotion efreet"
-RSUGGESTS_${PN} += "ewl-themes"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit efl1
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
new file mode 100644
index 0000000000..2ac7c65279
--- /dev/null
+++ b/packages/efl1/ewl_cvs.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library \
+based on the enlightenment foundation libraries."
+DEPENDS = "evas ecore edje emotion efreet"
+RSUGGESTS_${PN} += "ewl-themes"
+LICENSE = "MIT"
+PV = "0.5.1+cvs${SRCDATE}"
+PR = "r0"
+
+inherit efl_library
+
+# TODO package engines more granular
+PACKAGES += "${PN}-plugins ${PN}-engines"
+
+FILES_${PN} += "${sysconfdir}/ewl/*"
+FILES_${PN}-tests += "${libdir}/ewl/tests/*.so*"
+FILES_${PN}-dev += "${libdir}/ewl/*/*.a ${libdir}/ewl/*/*.la"
+FILES_${PN}-dbg += "${libdir}/ewl/*/.debug"
+
+FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
+FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
index 5ffdaef266..add3053a02 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_cvs.bb
@@ -2,12 +2,5 @@ DESCRIPTION = "Exml is a generic XML parser wrapper."
 LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 
-inherit efl1
+inherit efl_library
 
-SRC_URI = "${E_CVS};module=e17/libs/exml"
-S = "${WORKDIR}/exml"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN} = "${libdir}/*.so*"
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.0.002.bb
index 7ac8f97dcc..a50eca9623 100644
--- a/packages/efl1/imlib2_1.4.0.002.bb
+++ b/packages/efl1/imlib2_1.4.0.002.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 DEPENDS = "freetype libpng jpeg"
 PR = "r0"
 
-inherit efl1
+inherit efl_library
 
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"