7 files changed, 134 insertions, 54 deletions
diff --git a/recipes/e17/diskio_svn.bb b/recipes/e17/diskio_svn.bb
new file mode 100644
index 0000000000..3c0a8c7e71
--- /dev/null
+++ b/recipes/e17/diskio_svn.bb
@@ -0,0 +1,8 @@
+LICENSE = "MIT"
+PV = "0.0.1+svnr${SRCREV}"
+
+require e-module.inc
+
+
+
+
diff --git a/recipes/e17/e-wm/fix-profiles.diff b/recipes/e17/e-wm/fix-profiles.diff
new file mode 100644
index 0000000000..d6de73457e
--- /dev/null
+++ b/recipes/e17/e-wm/fix-profiles.diff
@@ -0,0 +1,10 @@
+===================================================================
+--- e/src/bin/e_config.c (revision 39880)
++++ e/src/bin/e_config.c (revision 39889)
+@@ -1134,5 +1134,5 @@
+      }
+    dir = e_prefix_data_get();
+-   len = snprintf(buf, sizeof(buf), "%s/data/config", dir);
++   len = snprintf(buf, sizeof(buf), "%s/data/config/", dir);
+    if (len >= (int)sizeof(buf))
+      return NULL;
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index c9694fce80..a1adc22bf1 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -1,11 +1,50 @@
 DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
+SRCNAME = "e"
 PV = "0.16.999.050+svnr${SRCREV}"
-PR = "r4"
+PR = "r6"
 
 inherit e update-alternatives
 
+SRC_URI += "\
+  file://enlightenment_start.oe \
+  file://applications.menu \
+  file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \
+  file://fix-profiles.diff;patch=1;maxrev=39889 \
+"
+
+SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+  --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+	autopoint
+}
+
+do_stage() {
+    autotools_stage_all
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+    # customising - should rather make this simple upstream
+    install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
+    install -d ${D}/${sysconfdir}/xdg/menus
+    install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+    for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done
+}
+
 RDEPENDS_${PN} += "\
   shared-mime-info \
   mime-support \
@@ -64,48 +103,9 @@ PACKAGE_ARCH_${PN}-other = "all"
 PACKAGE_ARCH_${PN}-input-methods = "all"
 PACKAGE_ARCH_${PN}-sysactions = "all"
 
-SRC_URI = "\
-  svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
-  file://enlightenment_start.oe \
-  file://applications.menu \
-  file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \
-"
-
-SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1 "
-
-S = "${WORKDIR}/e"
-
-EXTRA_OECONF = "\
-  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-  --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
-  --x-includes=${STAGING_INCDIR}/X11 \
-  --x-libraries=${STAGING_LIBDIR} \
-  --enable-simple-x11 \
-"
-
-do_configure_prepend() {
-	autopoint
-}
-
-do_stage() {
-    autotools_stage_all
-    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
-}
-
-do_install_append() {
-    # customising - should rather make this simple upstream
-    install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
-    install -d ${D}/${sysconfdir}/xdg/menus
-    install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
-    for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
-    for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done
-}
-
 FILES_${PN} = "\
   ${bindir}/* \
+  ${libdir}/enlightenment/utils/* \
   ${libdir}/enlightenment/modules/*/*.* \
   ${libdir}/enlightenment/modules/*/*/* \
   ${libdir}/enlightenment/preload/e_precache.so \
@@ -115,6 +115,7 @@ FILES_${PN} = "\
   ${datadir}/enlightenment/data/config/profile.cfg \
   ${datadir}/enlightenment/AUTHORS \
   ${datadir}/enlightenment/COPYING \
+  ${datadir}/xsessions/enlightenment.desktop \
   ${sysconfdir}/xdg \
 "
 FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
@@ -137,17 +138,27 @@ FILES_${PN}-utils = "${libdir}/enlightenment/utils/*"
 
 RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
 RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume"
-RRECOMMENDS_${PN}-config-minimalist = "${PN}-background-light-gradient \
-${PN}-theme-default"
-RRECOMMENDS_${PN}-config-netbook = "${PN}-background-dark-gradient \
-${PN}-theme-default"
+RRECOMMENDS_${PN}-config-minimalist = "\
+  ${PN}-background-light-gradient \
+  ${PN}-theme-default \
+"
+RRECOMMENDS_${PN}-config-netbook = "\
+  ${PN}-background-dark-gradient \
+  ${PN}-theme-default \
+"
 RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default"
 RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default"
 
 FILES_${PN}-dbg += "\
   ${libdir}/enlightenment/modules/*/*/.debug/ \
   ${libdir}/enlightenment/preload/.debug/ \
+  ${libdir}/enlightenment/utils/.debug/ \
 "
+
+FILES_${PN}-doc += "\
+  ${datadir}/enlightenment/doc \
+"
+
 CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
 
 ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
diff --git a/recipes/e17/elementary-sms_svn.bb b/recipes/e17/elementary-sms_svn.bb
new file mode 100644
index 0000000000..2f0eec3a85
--- /dev/null
+++ b/recipes/e17/elementary-sms_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An Elementary based SMS app"
+LICENSE = "GPL"
+DEPENDS = "ecore edbus elementary libefso"
+SECTION = "x11"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-sms;proto=http"
+S = "${WORKDIR}/elementary-sms"
+
+FILES_${PN} += "${bindir}/*"
+FILES_${PN} += "${datadir}/${PN}"
+FILES_${PN} += "${datadir}/icons/*"
+FILES_${PN} += "${datadir}/applications/*"
diff --git a/recipes/e17/exquisite/exquisite-init b/recipes/e17/exquisite/exquisite-init
index 1750184842..2de6774ffb 100644
--- a/recipes/e17/exquisite/exquisite-init
+++ b/recipes/e17/exquisite/exquisite-init
@@ -28,13 +28,13 @@ case `machine_id` in
 esac
 args=$args" $FPS $THEME"
 
-export EXDIR=/mnt/.exquisite
+export EXDIR=/mnt/.splash
 export EXQUISITE_IPC=$EXDIR/exquisite
 mount tmpfs -t tmpfs $EXDIR -o,size=40k
 exquisite -fb -fs $args &
 
-exquisite-write -wait 40
+exquisite-write -wait 120
 exquisite-write "PULSATE"
-
-# kill off exquisite in 300 seconds if its not gone yet
-(sleep 300; exquisite-write "QUIT")&
+setterm -blank 0
+setterm -powersave off
+setterm -powerdown 0
diff --git a/recipes/e17/exquisite/splashfuncs b/recipes/e17/exquisite/splashfuncs
new file mode 100644
index 0000000000..ada2a96dd4
--- /dev/null
+++ b/recipes/e17/exquisite/splashfuncs
@@ -0,0 +1,29 @@
+status() {
+  if type splash-write >/dev/null 2>&1; then
+    (TMPDIR="/mnt/.splash" EXQUISITE_IPC="$TMPDIR/exquisite" splash-write "$1" || true) &
+  fi
+}
+
+status_position() {
+  status "PROGRESS $1"
+}
+
+status_title() {
+  status "TITLE $1"
+}
+
+status_text() {
+  if test -n "$1"; then
+    status "MSG $1"
+  else
+    status "CLEAR"
+  fi
+}
+
+status_pulse() {
+  status "PULSATE"
+}
+
+status_tick() {
+  status "TICK"
+}
diff --git a/recipes/e17/exquisite_svn.bb b/recipes/e17/exquisite_svn.bb
index e303600d58..ac4c6b57d4 100644
--- a/recipes/e17/exquisite_svn.bb
+++ b/recipes/e17/exquisite_svn.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "A psplash replacement for display"
 LICENSE = "MIT BSD"
 DEPENDS = "eet evas ecore embryo edje"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r3"
+PR = "r8"
 RDEPENDS = "initscripts"
 RRECOMMENDS_${PN} = "exquisite-themes"
+RCONFLICTS_${PN} = "psplash virtual/psplash"
 
 SRCNAME = "exquisite"
 
@@ -13,13 +14,18 @@ inherit e
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 SRC_URI += "file://exquisite-init"
+SRC_URI += "file://splashfuncs"
 
 inherit update-rc.d
 
 do_install_prepend() {
-  install -d ${D}/mnt/.exquisite/
-  install -d ${D}${sysconfdir}/init.d/
+  install -d ${D}/mnt/.splash/
+  install -d ${D}${sysconfdir}/init.d
   install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite
+  install -d ${D}${sysconfdir}/default
+  install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs
+  install -d ${D}${bindir}
+  ln -s exquisite-write ${D}${bindir}/splash-write
 }
 
 
@@ -30,4 +36,4 @@ do_install_append() {
 INITSCRIPT_NAME = "exquisite"
 INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
 
-FILES_${PN} += "/mnt/.exquisite/"
+FILES_${PN} += "/mnt/.splash/"