merge of bdbeb53fb07854a8484b17504b9ab11113e0fe51

     and fda50be34c5e8aeb2a40fcb38520b83eea2db043

8 files changed, 36 insertions, 31 deletions

diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index 87fea43d20..1f3db9ddfe 100644
--- a/packages/efl/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,6 +1,5 @@
 include ecore.inc
-PROVIDES += "virtual/ecore"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-job \
@@ -16,6 +15,8 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-ipc \
 		--enable-ecore-txt \
 		--disable-ecore-x \
+		--disable-curl \
+		--without-curl-config \
 		--enable-ecore-config \
 		--disable-openssl"
 
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 6968415d34..abfb41d63b 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -1,3 +1,5 @@
 include ecore-fb_${PV}.bb
 inherit native
-DEPENDS = "curl-native eet-native evas-native"
+# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
+# DEPENDS = "curl-native eet-native evas-native"
+DEPENDS = "eet-native evas-native"
diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb
index 36a9c06413..b6b452cb71 100644
--- a/packages/efl/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.013.bb
@@ -1,5 +1,4 @@
 include ecore.inc
-PROVIDES += "virtual/ecore"
 DEPENDS += "evas-x11"
 PR = "r2"
 
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index ecd5fef642..ccc88b10c3 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -5,6 +5,7 @@ LEAD_SONAME = "libecore.so"
 LICENSE = "MIT"
 # can also have openssl, dbus
 DEPENDS = "virtual/evas curl eet"
+PROVIDES = "virtual/ecore"
 
 inherit efl
 
diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb
index 9286853d5e..492a0badb1 100644
--- a/packages/efl/evas-fb_0.9.9.013.bb
+++ b/packages/efl/evas-fb_0.9.9.013.bb
@@ -1,31 +1,31 @@
 include evas.inc
-PROVIDES += "virtual/evas"
-PR = "r1"
+DEPENDS = "freetype libpng jpeg eet"
+PR = "r2"
 
-EXTRA_OECONF = "--enable-fb			\
-		--disable-directfb		\
-		--disable-buffer		\
-		--disable-software-qtopia	\
-		--disable-software-x11		\
-		--disable-gl-x11		\
-		--enable-image-loader-eet	\
-		--enable-image-loader-edb	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-small-dither-mask	\
-		--enable-cpu-c			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--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	\
+EXTRA_OECONF = "--enable-fb         \
+		--disable-directfb          \
+		--disable-buffer            \
+		--disable-software-qtopia   \
+		--disable-software-x11      \
+		--disable-gl-x11            \
+		--enable-image-loader-eet   \
+		--disable-image-loader-edb  \
+		--enable-image-loader-png   \
+		--enable-image-loader-jpeg  \
+		--enable-small-dither-mask  \
+		--enable-cpu-c              \
+		--enable-font-loader-eet    \
+		--enable-scale-sample       \
+		--enable-scale-smooth       \
+		--enable-convert-yuv        \
+		--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	\
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
index 3eaa12cf9e..fd94b48ef2 100644
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
 include evas-fb_${PV}.bb
 inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native"
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 60f60f3c82..5876c1fd4e 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -5,6 +5,7 @@ your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
 # can also depend on valgrind (?)
 DEPENDS = "freetype libpng jpeg eet edb"
+PROVIDES = "virtual/evas"
 
 inherit efl
 
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index 0ea977fbe0..0205de4216 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
+# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb
 DEPENDS = "edb virtual/evas virtual/ecore edje emotion"
 RDEPENDS += "libewl-themes"
 LICENSE = "MIT"