ecore, evas, imlib2, esmart: Update vitrual and native PROVIDES

- Moved all virtual PROVIDES into inc files
- Made inc file PROVIDES always += and removed any extra PROVIDES in main files
- Made native builds override PROVIDES (native builds should not provide virtual)

diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index abfb41d..2994708 100644 (file)
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -3,3 +3,4 @@ inherit 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"
+PROVIDES = "ecore-native"
\ No newline at end of file

diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index ccc88b1..441d780 100644 (file)
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -4,8 +4,8 @@ timeouts and idle handlers fast, optimized, and convenient."
 LEAD_SONAME = "libecore.so"
 LICENSE = "MIT"
 # can also have openssl, dbus
-DEPENDS = "virtual/evas curl eet"
-PROVIDES = "virtual/ecore"
+DEPENDS += "virtual/evas curl eet"
+PROVIDES += "virtual/ecore"
 
 inherit efl
 

diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc
index 452222e..f4a5191 100644 (file)
--- a/packages/efl/esmart.inc
+++ b/packages/efl/esmart.inc
@@ -1,6 +1,7 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT"
 DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool"
+PROVIDES += "virtual/esmart"
 
 inherit efl
 

diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
index fd94b48..60bf7f6 100644 (file)
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -1,3 +1,4 @@
 include evas-fb_${PV}.bb
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
+PROVIDES = "evas-native"
\ No newline at end of file

diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb
index 901a23d..8e51a2a 100644 (file)
--- a/packages/efl/evas-x11_0.9.9.013.bb
+++ b/packages/efl/evas-x11_0.9.9.013.bb
@@ -1,5 +1,4 @@
 include evas.inc
-PROVIDES += "virtual/evas"
 DEPENDS += "x11 xext"
 PR = "r3"
 

diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 5876c1f..521ecb9 100644 (file)
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -5,7 +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"
+PROVIDES += "virtual/evas"
 
 inherit efl
 

diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb
index fdf9b17..09fecda 100644 (file)
--- a/packages/efl/imlib2-fb_1.2.1.004.bb
+++ b/packages/efl/imlib2-fb_1.2.1.004.bb
@@ -1,5 +1,4 @@
 include imlib2.inc
-PROVIDES += "virtual/imlib2"
 
 EXTRA_OECONF = "--without-x \
                --disable-mmx"

diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb
index e3a46c4..6f8ebe4 100644 (file)
--- a/packages/efl/imlib2-native_1.2.1.004.bb
+++ b/packages/efl/imlib2-native_1.2.1.004.bb
@@ -1,5 +1,6 @@
 include imlib2.inc
 inherit native
+PROVIDES = "imlib2-native"
 DEPENDS = "freetype-native libpng-native jpeg-native"
 
 EXTRA_OECONF = "--disable-mmx \

diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb
index 383473e..1653213 100644 (file)
--- a/packages/efl/imlib2-x11_1.2.1.004.bb
+++ b/packages/efl/imlib2-x11_1.2.1.004.bb
@@ -1,5 +1,4 @@
 include imlib2.inc
-PROVIDES += "virtual/imlib2"
 DEPENDS += "x11 xext"
 
 EXTRA_OECONF = "--disable-mmx \

diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index a6982e2..4691bf2 100644 (file)
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -2,6 +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"
+PROVIDES += "virtual/imlib2"
 
 inherit efl