From 53608e94eb26eb27e306262c2e5ebf513728b49c Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 20 Aug 2005 10:45:36 +0000
Subject: [PATCH] Add Xsession entry for e-wm Add initscript setup to entrance
 Add chkhinge, e-modules, e-utils, and evidence to task-enlightenment-x11

---
 .../meta => e17/e-wm/Xsession.d}/.mtn2git_empty        |  0
 packages/e17/e-wm/Xsession.d/98enlightenment           |  3 +++
 packages/e17/e-wm_20050810.bb                          | 10 ++++++++--
 packages/e17/entrance_20050810.bb                      |  5 ++++-
 packages/{nonworking => }/meta/e-image.bb              |  0
 packages/meta/meta-e-x11.bb                            | 10 +++++-----
 6 files changed, 20 insertions(+), 8 deletions(-)
 rename packages/{nonworking/meta => e17/e-wm/Xsession.d}/.mtn2git_empty (100%)
 create mode 100644 packages/e17/e-wm/Xsession.d/98enlightenment
 rename packages/{nonworking => }/meta/e-image.bb (100%)

diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/e17/e-wm/Xsession.d/.mtn2git_empty
similarity index 100%
rename from packages/nonworking/meta/.mtn2git_empty
rename to packages/e17/e-wm/Xsession.d/.mtn2git_empty
diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment
new file mode 100644
index 0000000000..65f46284a9
--- /dev/null
+++ b/packages/e17/e-wm/Xsession.d/98enlightenment
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec enlightenment
\ No newline at end of file
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb
index 7929f1a807..ea93bfc3e2 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050810.bb
@@ -4,9 +4,10 @@ LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+           file://Xsession.d/98enlightenment \
            file://fix-configure.patch;patch=1 \
            file://add-menu-autoscroll-options.patch;patch=1"
 S = "${WORKDIR}/e"
@@ -24,4 +25,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \
                 --x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR}"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+}
\ No newline at end of file
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index cc316c568e..d032eeacf3 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -20,7 +20,10 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
 	   
 S = "${WORKDIR}/entrance"
 
-inherit autotools
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "entrance"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
                 --with-xsession=/etc/X11/Xsession"
diff --git a/packages/nonworking/meta/e-image.bb b/packages/meta/e-image.bb
similarity index 100%
rename from packages/nonworking/meta/e-image.bb
rename to packages/meta/e-image.bb
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index b4f3558e93..45e3d67384 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 LICENSE = "MIT"
 PACKAGES = "task-enlightenment-x11"
-PR = "r2"
+PR = "r4"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -12,13 +12,13 @@ ALLOW_EMPTY = 1
 # X
 #
 DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
-             ttf-bitstream-vera bash"
+             ttf-bitstream-vera bash chkhinge"
 RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
-             ttf-bitstream-vera"
+             ttf-bitstream-vera chkhinge"
 
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice eclair examine "
-RDEPENDS += "entrance e-wm entice eclair examine "
+DEPENDS  += "entrance e-wm entice eclair examine evidence e-modules e-utils"
+RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils"
 
-- 
2.39.5