merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'

     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'

21 files changed, 117 insertions, 106 deletions

diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb
index 92a30397e1..52855d99a8 100644
--- a/packages/efl1/ecore-native_cvs.bb
+++ b/packages/efl1/ecore-native_cvs.bb
@@ -4,7 +4,11 @@ DEPENDS = "eet-native evas-native"
 PR = "r2"
 
 EXTRA_OECONF = "\
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+				\
                 --enable-ecore-txt \
+                --disable-ecore-config \
                 --disable-ecore-x-xcb \
                 --disable-ecore-x \
                 --enable-ecore-job \
@@ -12,7 +16,7 @@ EXTRA_OECONF = "\
                 --disable-ecore-sdl \
                 --enable-ecore-fb \
                 --enable-ecore-evas \
-                --disable-ecore-evas-gl \
+                --disable-ecore-evas-x11-gl \
                 --disable-ecore-evas-xrender \
                 --disable-ecore-evas-dfb \
                 --disable-openssl \
@@ -24,6 +28,6 @@ EXTRA_OECONF = "\
                 --disable-poll \
                 --disable-curl \
                 --disable-ecore-desktop \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} "
-
+                --disable-ecore-imf \
+                --disable-ecore-imf_evas \
+"
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index b71a4b7582..6175c605c0 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -1,18 +1,12 @@
-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 directfb eet evas tslib"
+DESCRIPTION = "Ecore is the Enlightenment application framework library"
+LICENSE = "MIT BSD"
+DEPENDS = "curl eet evas tslib"
 # optional
-# DEPENDS += "openssl virtual/libiconv"
-PV = "0.9.9.041+cvs${SRCDATE}"
+# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
+PV = "0.9.9.042+cvs${SRCDATE}"
 
 inherit efl_library
 
-# SRC_URI += "file://configure.patch;patch=1 \
-#           file://fix-tslib-configure.patch;patch=1 \
-#           file://fix-directfb-include.patch;patch=1"
-
 SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
@@ -26,6 +20,8 @@ PACKAGES += "\
     ${PN}-evas \
     ${PN}-fb \
     ${PN}-file \
+    ${PN}-imf \
+    ${PN}-imf-evas \
     ${PN}-ipc \
     ${PN}-job \
     ${PN}-txt \
@@ -40,6 +36,8 @@ 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.*"
+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.*"
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index 53ee8642d8..b0a2a24f98 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,8 +1,13 @@
 require ecore.inc
-PR = "r5"
+PR = "r0"
 
 EXTRA_OECONF = "\
+        --x-includes=${STAGING_INCDIR}/X11 \
+        --x-libraries=${STAGING_LIBDIR} \
+        --enable-simple-x11 \
+\
 		--enable-ecore-txt \
+        --enable-ecore-config \
 		--disable-ecore-x-xcb \
 		--enable-ecore-x \
 		--enable-ecore-job \
@@ -10,9 +15,10 @@ EXTRA_OECONF = "\
 		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
-		--disable-ecore-evas-gl \
+		--enable-ecore-evas-x11-16 \
+        --disable-ecore-evas-x11-gl \
 		--enable-ecore-evas-xrender \
-		--enable-ecore-evas-dfb \
+		--disable-ecore-evas-dfb \
 		--disable-openssl \
 		--enable-abstract-sockets \
 		--enable-ecore-con \
@@ -21,6 +27,5 @@ EXTRA_OECONF = "\
 		--enable-inotify \
 		--disable-poll \
 		--enable-curl \
-		--enable-ecore-desktop \
-		--x-includes=${STAGING_INCDIR}/X11 \
-		--x-libraries=${STAGING_LIBDIR}	"
+		--disable-ecore-desktop \
+"
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index b7c85e8663..97dafb3931 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -1,5 +1,6 @@
-DESCRIPTION = "Edb is a database library"
-LICENSE = "MIT"
-PV = "0.0.0+cvs${SRCDATE}"
+DESCRIPTION = "Edb is the Enlightenment database library"
+LICENSE = "MIT BSD"
+DEPENDS = "zlib"
+PV = "1.0.5.042+cvs${SRCDATE}"
 
 inherit efl_library
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index db1547c3d4..28bcbb1816 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
-LICENSE = "MIT"
-PR = "r0"
+LICENSE = "MIT BSD"
+PR = "r2"
 
 inherit efl_library
 
-SRC_URI = "${E_CVS};module=e17/proto/e_dbus"
+SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-# TODO increase package granularity
-
+PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
+FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
+FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
+FILES_${PN}-enm = "${libdir}/libenm.so.*"
+FILES_${PN}-ehal = "${libdir}/libehal.so.*"
diff --git a/packages/efl1/edje-native_cvs.bb b/packages/efl1/edje-native_cvs.bb
index 2c52b69a0c..519476be72 100644
--- a/packages/efl1/edje-native_cvs.bb
+++ b/packages/efl1/edje-native_cvs.bb
@@ -3,7 +3,6 @@ inherit native
 PR = "r0"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 do_configure_prepend() {
 	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 0a5521f929..e930fc4795 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -1,11 +1,10 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
+DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
-PV = "0.5.0.41+cvs${SRCDATE}"
+LICENSE = "MIT BSD"
+PV = "0.5.0.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
 
-# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
-
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${bindir}/edje_*"
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index cd12daf245..370b385bf8 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -1,10 +1,7 @@
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
+DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
-PV = "0.9.10.041+cvs${SRCDATE}"
+LICENSE = "MIT BSD"
+PV = "0.9.10.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index 3f903d3484..a1a027fc8f 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -1,8 +1,7 @@
-DESCRIPTION = "An implementation of freedesktop.org specs for the \
-Enlightenment Foundation Libraries"
+DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
-LICENSE = "BSD"
-PV = "0.0.3.003+cvs${SRCDATE}"
+LICENSE = "MIT BSD"
+PV = "0.0.3.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index dcba8557a8..2f5ab176ce 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
-of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
-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.041+cvs${SRCDATE}"
+DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
+LICENSE = "MIT BSD"
+PV = "0.9.1.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 84302e4793..36a5065e7a 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine"
-LICENSE = "MIT"
+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.0.1+cvs${SRCDATE}"
+PV = "0.1.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch
index dd5469c286..b218fffb7a 100644
--- a/packages/efl1/epdf/fix-plugin-path-check.patch
+++ b/packages/efl1/epdf/fix-plugin-path-check.patch
@@ -2,18 +2,18 @@ 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,
+@@ -95,8 +95,8 @@
+      [
+       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)
+      ],
+@@ -144,7 +144,7 @@
    [
     have_epsilon="yes"
     requirements="$requirements epsilon imlib2"
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index 8426b75a17..fa4f4282e1 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -1,9 +1,8 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
-LICENSE = "BSD"
-DEPENDS = "poppler0.6 evas ecore etk ewl"
+LICENSE = "MIT BSD"
+DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
-
-PR = "r1"
+PR = "r0"
 
 inherit efl_library
 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index be2934dec8..8c71ef3e3d 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
 that is compliant with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
-PV = "0.3.0+cvs${SRCDATE}"
+PV = "0.3.0.012+cvs${SRCDATE}"
 
 inherit efl_library
 
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index 17e1f42b95..fa35d60d30 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-PV = "0.9.0+cvs${SRCDATE}"
+PV = "0.9.0.042+cvs${SRCDATE}"
 
 inherit efl_library
 
diff --git a/packages/efl1/etk-native/.mtn2git_empty b/packages/efl1/etk-native/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/efl1/etk-native/.mtn2git_empty
+++ /dev/null
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index ad959edef6..90df74e61c 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
-PV = "0.1.0+cvs${SRCDATE}"
+PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
@@ -15,3 +15,4 @@ FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}"
 FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
 FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
 
+RRECOMMENDS_${PN} = "${PN}-engines"
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 179f03b0d8..77ec2db308 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -1,18 +1,12 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
-LICENSE = "MIT"
+DESCRIPTION = "Evas is the Enlightenment canvas API"
+LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
-PV = "0.9.9.041+cvs${SRCDATE}"
+DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
+PV = "0.9.9.042+cvs${SRCDATE}"
 
 inherit efl_library
 
-# SRC_URI += "file://fix-configure.patch;patch=1"
-
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
-
 EXTRA_OECONF = "<override me>"
 
 python populate_packages_prepend () {
@@ -35,3 +29,19 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
 
 PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+
+RRECOMMENDS_${PN} = "\
+  libevas-engine-buffer \
+  libevas-engine-fb \
+  libevas-engine-software-generic \
+  libevas-engine-software-x11 \
+  libevas-engine-software-16 \
+  libevas-engine-software-16-x11 \
+  libevas-engine-xrender-x11 \
+  \
+  libevas-loader-png \
+  libevas-loader-jpeg \
+  libevas-loader-eet \
+  libevas-loader-svg \
+"
+
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 1bacbe3d1c..862cc51370 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r3"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
@@ -10,6 +10,7 @@ EXTRA_OECONF = "\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
+		--enable-simple-x11		\
 		--enable-software-x11		\
 		--enable-software-16-x11	\
 		--disable-software-xcb		\
@@ -45,15 +46,15 @@ EXTRA_OECONF = "\
 		--disable-convert-16-rgb-444	\
 		--disable-convert-16-rgb-ipq	\
 		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-90	\
 		--enable-convert-16-rgb-rot-270	\
-		--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"
+		--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	\
+		--enable-convert-32-rgb-rot-270"
 
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 8fb8521d62..15a777df67 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -1,11 +1,8 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library \
-based on the enlightenment foundation libraries."
+DESCRIPTION = "The Enlightened Widget Library"
 DEPENDS = "evas ecore edje emotion efreet epsilon"
-RSUGGESTS_${PN} += "ewl-themes"
-LICENSE = "MIT"
-PV = "0.5.1+cvs${SRCDATE}"
-PR = "r1"
+LICENSE = "MIT BSD"
+PV = "0.5.2.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
 
@@ -31,3 +28,5 @@ FILES_${PN}-dbg += "${libdir}/ewl/*/.debug"
 
 FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
 FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
+
+RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes"
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.1.000.bb
index baee4b62b0..b0db13b5ce 100644
--- a/packages/efl1/imlib2_1.4.0.002.bb
+++ b/packages/efl1/imlib2_1.4.1.000.bb
@@ -2,7 +2,7 @@ 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"
-PR = "r2"
+PR = "r0"
 
 inherit efl_library