[oe] [PATCH] e-wm: use E_WM_SYSACTIONS variable instead of hardcoded e-wm-sysactions runtime dependency

[Martin Jansa]

* e-wm-sysactions-shr doesn't need RPROVIDES anymore
* fixes last multiple providers notice I had
  NOTE: multiple providers are available for runtime e-wm-sysactions (e-wm, e-wm-sysactions-shr)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match e-wm-sysactions

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 conf/distro/shr.conf                   |    1 +
 recipes/e17/e-wm_svn.bb                |    6 ++++--
 recipes/images/illume-image.bb         |    3 ++-
 recipes/shr/e-wm-sysactions-shr_git.bb |    4 +---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index be2441a..b24a392 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -115,6 +115,7 @@ IMAGE_INITSCRIPTS = "initscripts-shr"
 IPKG_VARIANT = "opkg"
 
 #Illume settings
+E_WM_SYSACTIONS = "e-wm-sysactions-shr"
 ILLUME_CONFIG = "e-wm-config-illume2-shr"
 ILLUME_THEME = "e-wm-theme-illume-gry"
 
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index e8f6b1e..9c22e65 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus eeze"
 LICENSE = "MIT BSD"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r18"
+PR = "r19"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives
@@ -91,13 +91,15 @@ PACKAGES =+ "\
   illume-keyboard-default-terminal \
 "
 
+E_WM_SYSACTIONS ?= "${PN}-sysactions"
+
 RRECOMMENDS_${PN} = "\
   ${PN}-config-default \
   ${PN}-images \
   ${PN}-icons \
   ${PN}-other \
   ${PN}-input-methods \
-  ${PN}-sysactions \
+  ${E_WM_SYSACTIONS} \
 "
 
 PACKAGE_ARCH_${PN}-config-default = "all"
diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb
index e01ef27..15bed58 100644
--- a/recipes/images/illume-image.bb
+++ b/recipes/images/illume-image.bb
@@ -10,6 +10,7 @@ SPLASH = "exquisite exquisite-themes exquisite-theme-illume"
 # Default illume theme
 ILLUME_THEME ?= "e-wm-theme-illume"
 ILLUME_CONFIG ?= "e-wm-config-illume2"
+E_WM_SYSACTIONS ?= "e-wm-sysactions"
 
 # getting the base system up
 BASE_INSTALL = "\
@@ -43,7 +44,7 @@ X_INSTALL = "\
   mime-support \
   e-wm \
   e-wm-menu \
-  e-wm-sysactions \
+  ${E_WM_SYSACTIONS} \
   ${ILLUME_CONFIG} \
   ${ILLUME_THEME} \
   e-wm-config-standard \
diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb
index 68d5b30..6f5da4c 100644
--- a/recipes/shr/e-wm-sysactions-shr_git.bb
+++ b/recipes/shr/e-wm-sysactions-shr_git.bb
@@ -3,12 +3,10 @@ SECTION = "e/utils"
 LICENSE = "MIT BSD"
 SRCREV = "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 PV = "1.2+gitr${SRCPV}"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "all"
 
-RPROVIDES_${PN} = "e-wm-sysactions"
 RCONFLICTS_${PN} = "e-wm-sysactions"
-#RREPLACES_${PN} = "e-wm-sysactions"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
-- 
1.7.4.1