merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'

     and 'c49f478890b0d92c1c59e4c0cf0d74b6990e6745'

28 files changed, 78 insertions, 148 deletions

diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 6175c605c0..84c0b90c29 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -5,7 +5,7 @@ DEPENDS = "curl eet evas tslib"
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 97dafb3931..8ad9c361a0 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index d9c2b83b79..0a4e04e558 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,16 +1,19 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore"
+DEPENDS = "dbus ecore efreet ewl"
 LICENSE = "MIT BSD"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
+EXTRA_OECONF = "--enable-build-test-gui"
+
+PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
+FILES_${PN}-test-gui = "${bindir}/e_dbus_hal"
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index e930fc4795..d0a1848c93 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
 
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${bindir}/edje_*"
+PACKAGES =+ "${PN}-utils"
+DEBIAN_NOAUTONAME_${PN}-utils = "1"
+FILES_${PN}-utils = "\
+  ${bindir}/edje_* \
+  ${datadir}/edje/include/edje.inc \
+"
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index 370b385bf8..c834cfa60a 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT BSD"
 PV = "0.9.10.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb
index ce01d89112..19db2ef41e 100644
--- a/packages/efl1/eflpp_cvs.bb
+++ b/packages/efl1/eflpp_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
 PV = "0.1.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index a1a027fc8f..3087391312 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.0.3.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 PACKAGES =+ "${PN}-mime"
 FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 2f5ab176ce..6befb0c065 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
+
+# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug
+#FULL_OPTIMIZATION_arm =+ "-O0"
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 36a5065e7a..826f201779 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 # 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.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
-PACKAGES =+ "emotion-backend-gstreamer emotion-test"
+PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb
index 689e254fc1..ec39189410 100644
--- a/packages/efl1/engrave_cvs.bb
+++ b/packages/efl1/engrave_cvs.bb
@@ -4,4 +4,4 @@ LICENSE = "MIT"
 DEPENDS = "evas ecore"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb
index 728beb61ec..8c73fbe1d8 100644
--- a/packages/efl1/enhance_cvs.bb
+++ b/packages/efl1/enhance_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "exml"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index fa4f4282e1..e48c36606e 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
            file://fix-plugin-path-check.patch;HACK=1;patch=1"
diff --git a/packages/efl1/epeg_cvs.bb b/packages/efl1/epeg_cvs.bb
index 3991dd3d21..16d1c333a9 100644
--- a/packages/efl1/epeg_cvs.bb
+++ b/packages/efl1/epeg_cvs.bb
@@ -4,4 +4,4 @@ DEPENDS = "jpeg"
 PV = "0.9.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/epsilon/compile-fix.patch b/packages/efl1/epsilon/compile-fix.patch
deleted file mode 100644
index 1c42cc59c4..0000000000
--- a/packages/efl1/epsilon/compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix
-+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c
-@@ -48,7 +48,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#include <math.h>
- #include <float.h>
- #include <ctype.h>
- 
diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch
new file mode 100644
index 0000000000..7a635bcf88
--- /dev/null
+++ b/packages/efl1/epsilon/fix_alignment_error.patch
@@ -0,0 +1,13 @@
+Index: epsilon/src/lib/exiftags/canon.c
+===================================================================
+--- epsilon.orig/src/lib/exiftags/canon.c	2007-12-03 17:45:27.000000000 -0300
++++ epsilon/src/lib/exiftags/canon.c	2007-12-03 17:46:59.000000000 -0300
+@@ -52,7 +52,7 @@
+ struct ccstm {
+ 	int32_t val;
+ 	struct descrip *table;
+-	const char descr[];
++	const char *descr;
+ };
+ 
+ 
diff --git a/packages/efl1/epsilon/server-is-not-client.patch b/packages/efl1/epsilon/server-is-not-client.patch
deleted file mode 100644
index e96e528b9e..0000000000
--- a/packages/efl1/epsilon/server-is-not-client.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/epsilon_private.h	2006-12-01 12:06:30.000000000 +0100
-+++ epsilon-0.3.0.007/src/include/epsilon_private.h	2006-12-01 12:07:10.928254000 +0100
-@@ -41,7 +41,7 @@
- Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status);
- 
- int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
--int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
-+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg);
- 
- Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end);
- 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 8c71ef3e3d..0c12621d33 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -4,8 +4,11 @@ LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
+PR = "r1"
 
-inherit efl_library
+inherit efl
+
+SRC_URI += "file://fix_alignment_error.patch;patch=1"
 
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index fa35d60d30..6cdae5754d 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
 PV = "0.9.0.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb
index 6770be4ab3..eedb832141 100644
--- a/packages/efl1/etk-native_cvs.bb
+++ b/packages/efl1/etk-native_cvs.bb
@@ -3,8 +3,3 @@ inherit native
 DEPENDS = "evas-native ecore-native edje-native"
 
 SRC_URI += "file://no-tests.patch;patch=1"
-
-do_stage_append() {
-	mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
-}
-
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index 90df74e61c..a39129fc69 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 # TODO package engines seperatly (do_split_packages)
 
@@ -16,3 +16,21 @@ FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
 FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
 
 RRECOMMENDS_${PN} = "${PN}-engines"
+
+PACKAGES += "etk-engines-software-x11"
+FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+
+#PACKAGES =+ "etk-engines-gl-x11"
+#FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
+
+PACKAGES =+ "etk-engines-evas"
+FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+
+PACKAGES =+ "etk-engines-fb"
+FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+
+PACKAGES =+ "etk-engines-x11"
+FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+
+PACKAGES =+ "etk-engines-software-x11-16"
+FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 77ec2db308..e4779d5b44 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
 PV = "0.9.9.042+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 EXTRA_OECONF = "<override me>"
@@ -26,7 +26,6 @@ do_install_append() {
 
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-FILES_${PN} = "${libdir}/libevas*.so*"
 
 PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
 
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
deleted file mode 100644
index 1a5bf78e46..0000000000
--- a/packages/efl1/evas/fix-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: evas/configure.in
-===================================================================
---- evas.orig/configure.in	2007-08-20 16:44:22.000000000 +0000
-+++ evas/configure.in	2007-08-20 16:49:08.000000000 +0000
-@@ -260,9 +260,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software X11 engine)
-@@ -303,9 +301,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software 16bit X11 engine)
-@@ -599,10 +595,7 @@
-       [
-         AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
-         AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--        x_dir=${x_dir:-/usr/X11R6};
--        x_cflags=${x_cflags:--I$x_dir/include}
--        x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--        gl_cflags="-I/usr/include"
-+        x_libs="${x_libs} -lX11 -lXext"
-         gl_libs="-lGL -lGLU -lpthread"
-         gl_dir=""
-       ],
-@@ -694,9 +687,7 @@
-       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
-       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
--      x_dir="/usr/X11R6";
--      x_cflags="-I"$x_dir"/include"
--      x_libs="-L"$x_dir"/lib -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ], [
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
-@@ -738,9 +729,7 @@
-       AC_CHECK_HEADER(X11/extensions/Xrender.h,
-         [
-           AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
-+          x_libs="${x_libs} -lX11 -lXext -lXrender"
- 	],
- 	[
-           AC_MSG_RESULT(disabling xrender X11 engine)
-@@ -826,9 +815,7 @@
-     [
-       PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
- 	[
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+          x_libs="${x_libs} -lX11 -lXext"
-           AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
-         ],
-         [
diff --git a/packages/efl1/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch
deleted file mode 100644
index 5efd16a96e..0000000000
--- a/packages/efl1/evas/pagesize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
-index e26c171..75e0743 100644
---- a/src/modules/engines/fb/evas_fb_main.c
-+++ b/src/modules/engines/fb/evas_fb_main.c
-@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
-       fb_cleanup();
-       exit(1);
-     }
--  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
-+  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
-   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
- 				 PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
-   if ((int)mode->mem == -1)
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 862cc51370..ebe604ec2b 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -47,6 +47,7 @@ EXTRA_OECONF = "\
 		--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	\
 		--enable-convert-24-rgb-888	\
 		--enable-convert-24-bgr-888	\
@@ -56,5 +57,6 @@ EXTRA_OECONF = "\
 		--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"
 
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb
index 272d90002e..02706eb978 100644
--- a/packages/efl1/evolve_cvs.bb
+++ b/packages/efl1/evolve_cvs.bb
@@ -3,4 +3,4 @@ LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
 PV = "0.0.0+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 15a777df67..eb00215891 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 PV = "0.5.2.042+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 EXTRA_OECONF = "\
   --enable-software-x11 \
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
index b94af05833..d63fa056bb 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_cvs.bb
@@ -3,5 +3,5 @@ LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 PV = "0.1.1+cvs${SRCDATE}"
 
-inherit efl_library
+inherit efl
 
diff --git a/packages/efl1/imlib2_1.4.1.000.bb b/packages/efl1/imlib2_cvs.bb
index b0db13b5ce..c1d1f72791 100644
--- a/packages/efl1/imlib2_1.4.1.000.bb
+++ b/packages/efl1/imlib2_cvs.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PV = "1.4.1.000+cvs${SRCDATE}"
 PR = "r0"
 
-inherit efl_library
+inherit efl
 
 SRC_URI += "file://remove-local-includes.patch;patch=1"