10 files changed, 32 insertions, 26 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index ddf5dd340e..2ce5d3bcbb 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -104,8 +104,10 @@ IMAGE_INITSCRIPTS = "initscripts-shr"
 IPKG_VARIANT = "opkg"
 
 #Illume settings
-ILLUME_CONFIG = "e-wm-config-illume2-shr"
-ILLUME_THEME = "e-wm-theme-illume-gry"
+ESYSACTIONS = "e-wm-sysactions-shr"
+EMENU = "e-wm-menu-shr"
+ECONFIG = "e-wm-config-illume2-shr"
+ETHEME = "e-wm-theme-illume-gry"
 
 # From minimal.conf
 
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index e8f6b1eab9..b7ce1b14f6 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 \
 "
 
+ESYSACTIONS ?= "${PN}-sysactions"
+
 RRECOMMENDS_${PN} = "\
   ${PN}-config-default \
   ${PN}-images \
   ${PN}-icons \
   ${PN}-other \
   ${PN}-input-methods \
-  ${PN}-sysactions \
+  ${ESYSACTIONS} \
 "
 
 PACKAGE_ARCH_${PN}-config-default = "all"
diff --git a/recipes/freesmartphone/menu-freesmartphone.bb b/recipes/freesmartphone/menu-freesmartphone.bb
index 2d1f6145c4..3dfcc3b8f9 100644
--- a/recipes/freesmartphone/menu-freesmartphone.bb
+++ b/recipes/freesmartphone/menu-freesmartphone.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "XDG menu file for the freesmartphone.org project"
 LICENSE = "PD"
 PV = "0.1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "file://applications.menu"
 
@@ -10,7 +10,7 @@ do_install() {
     install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
 }
 
-RPROVIDES_${PN} = "e-wm-menu"
+RCONFLICTS_${PN} = "e-wm-menu"
 CONFFILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
 FILES_${PN} = "${sysconfdir}/xdg/menus/applications.menu"
 
diff --git a/recipes/images/fso-illume-image.bb b/recipes/images/fso-illume-image.bb
index 8c5d896872..d803aa2b9a 100644
--- a/recipes/images/fso-illume-image.bb
+++ b/recipes/images/fso-illume-image.bb
@@ -14,7 +14,7 @@ BASE_INSTALL = "\
   task-base \
 "
 
-ILLUME_THEME = "illume-theme-fso"
+ETHEME = "illume-theme-fso"
 
 X_INSTALL = "\
   task-x11-illume \
diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc
index ea48d91513..adce0e97a9 100644
--- a/recipes/images/fso-image.inc
+++ b/recipes/images/fso-image.inc
@@ -9,7 +9,7 @@ BASE_INSTALL = "\
   task-base \
 "
 
-ILLUME_THEME = "illume-theme-freesmartphone"
+ETHEME = "illume-theme-freesmartphone"
 
 X_INSTALL = "\
   task-x11-illume \
diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb
index e01ef276ee..3f146c6b88 100644
--- a/recipes/images/illume-image.bb
+++ b/recipes/images/illume-image.bb
@@ -8,8 +8,10 @@ IMAGE_LINGUAS = "en-us de-de fr-fr pt-br ca-es zh-cn zh-tw bg-bg cs-cz da-dk nl-
 SPLASH = "exquisite exquisite-themes exquisite-theme-illume"
 
 # Default illume theme
-ILLUME_THEME ?= "e-wm-theme-illume"
-ILLUME_CONFIG ?= "e-wm-config-illume2"
+ETHEME ?= "e-wm-theme-illume"
+ECONFIG ?= "e-wm-config-illume2"
+ESYSACTIONS ?= "e-wm-sysactions"
+EMENU ?= "e-wm-menu"
 
 # getting the base system up
 BASE_INSTALL = "\
@@ -42,10 +44,10 @@ X_INSTALL = "\
   shared-mime-info \
   mime-support \
   e-wm \
-  e-wm-menu \
-  e-wm-sysactions \
-  ${ILLUME_CONFIG} \
-  ${ILLUME_THEME} \
+  ${EMENU} \
+  ${ESYSACTIONS} \
+  ${ECONFIG} \
+  ${ETHEME} \
   e-wm-config-standard \
   e-wm-config-netbook \
   e-wm-config-minimalist \
diff --git a/recipes/shr/e-wm-config-illume2-shr_git.bb b/recipes/shr/e-wm-config-illume2-shr_git.bb
index 4d9176ff1b..692d979644 100644
--- a/recipes/shr/e-wm-config-illume2-shr_git.bb
+++ b/recipes/shr/e-wm-config-illume2-shr_git.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT BSD"
 RDEPENDS_${PN} = "shr-e-gadgets"
 SRCREV = "b166fa3c8f7160c0102877d32ee3ad09c8afaa7d"
 PV = "1.2+gitr${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 inherit e
 
@@ -19,9 +19,12 @@ EXTRA_OECONF = "\
 
 FILES_${PN} = "${datadir}/enlightenment/data/config/illume2-shr"
 
+ESYSACTIONS ?= "e-wm-sysactions"
+EMENU ?= "e-wm-menu"
+
 RRECOMMENDS_${PN} = "\
-  e-wm-sysactions-shr \
-  e-wm-menu-shr \
+  ${ESYSACTIONS} \
+  ${EMENU} \
   illume-keyboard-default-alpha \
   illume-keyboard-numeric-alt \
   illume-keyboard-default-terminal \
diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb
index 68d5b30402..6f5da4cf23 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"
 
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index b9449e9f14..1c0e2b12a1 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r40"
+PR = "r41"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -107,7 +107,6 @@ RDEPENDS_${PN}-audio = "\
 RDEPENDS_${PN}-x = "\
   task-x11-illume \
   task-fonts-truetype-core \
-  e-wm-menu-shr \
   shr-wizard \
   shr-theme-gry \
   xcursor-transparent-theme \
diff --git a/recipes/tasks/task-x11-illume.bb b/recipes/tasks/task-x11-illume.bb
index 5af3a30d51..7c6fe3ec61 100644
--- a/recipes/tasks/task-x11-illume.bb
+++ b/recipes/tasks/task-x11-illume.bb
@@ -9,8 +9,8 @@ PR = "r1"
 inherit task
 
 # Default illume theme
-ILLUME_THEME ?= "e-wm-theme-illume"
-ILLUME_CONFIG ?= "e-wm-config-illume2"
+ETHEME ?= "e-wm-theme-illume"
+ECONFIG ?= "e-wm-config-illume2"
 
 RDEPENDS_${PN} = "\
   task-x11-server \
@@ -18,6 +18,6 @@ RDEPENDS_${PN} = "\
 #  xserver-kdrive-splash-illume \
   \
   e-wm \
-  ${ILLUME_CONFIG} \
-  ${ILLUME_THEME} \
+  ${ECONFIG} \
+  ${ETHEME} \
 "