merge of 97d200dc7ec222ba39a0dea542d91ccc2ac67ddd

     and d738d315f5897c652347f64e95f0be7cb643b622

8 files changed, 147 insertions, 14 deletions

diff --git a/packages/e17/e-wm_0.16.999.023.bb b/packages/e17/e-wm_0.16.999.023.bb
index 8bca19b616..f7f61ef747 100644
--- a/packages/e17/e-wm_0.16.999.023.bb
+++ b/packages/e17/e-wm_0.16.999.023.bb
@@ -9,12 +9,14 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz
            file://fix-configure.patch;patch=1 \
            file://remove-large-fonts.patch;patch=1 \
            file://Xsession.d/98enlightenment"
+	   
 #           cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
 #           file://disable-splash.patch;patch=1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1"
+	
 
 S = "${WORKDIR}/enlightenment-${PV}"
 
diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.005.bb
index 1f3a46e2d8..c17d52c587 100644
--- a/packages/e17/entrance_0.9.0.005.bb
+++ b/packages/e17/entrance_0.9.0.005.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Entrance is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common"
-RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
+DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common login-manager"
+RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-PR = "r11"
+PR = "r13"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \
            file://config-db.patch;patch=1 \
@@ -19,10 +19,7 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \
 
 S = "${WORKDIR}/entrance-${PV}"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "entrance"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
@@ -37,5 +34,5 @@ do_install_append() {
 	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
 
 	install -d ${D}/etc/X11/login-managers/
-	mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
+	mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance	
 }
diff --git a/packages/gpe-dm/files/multi-lm.patch b/packages/gpe-dm/files/multi-lm.patch
new file mode 100644
index 0000000000..1c389494ce
--- /dev/null
+++ b/packages/gpe-dm/files/multi-lm.patch
@@ -0,0 +1,12 @@
+--- gpe-dm-0.48/Makefile.orig	2005-08-29 12:16:35.000000000 +0200
++++ gpe-dm-0.48/Makefile	2006-02-09 05:00:22.000000000 +0100
+@@ -30,7 +30,8 @@
+ 	install -s gpe-dm $(DESTDIR)$(PREFIX)/bin/
+ 	install -d $(DESTDIR)/etc/init.d
+ 	install -d $(DESTDIR)/etc/rc2.d
+-	install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm
++	install -d $(DESTDIR)/etc/X11//login-managers	
++	install gpe-dm.init $(DESTDIR)/etc/X11/login-managers/gpe-dm
+ 	install -d $(DESTDIR)/etc/X11
+ 
+ clean: clean-po
diff --git a/packages/gpe-dm/gpe-dm_0.48.bb b/packages/gpe-dm/gpe-dm_0.48.bb
index 8cd6c2bea4..9114967ab2 100644
--- a/packages/gpe-dm/gpe-dm_0.48.bb
+++ b/packages/gpe-dm/gpe-dm_0.48.bb
@@ -1,14 +1,13 @@
 LICENSE = "GPL"
-inherit gpe update-rc.d
+inherit gpe
 
 DESCRIPTION = "GPE Desktop Manager"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 xserver-common"
-RDEPENDS_${PN} += "xserver-common"
-PR = "r0"
+DEPENDS = "glib-2.0 xserver-common login-manager"
+RDEPENDS_${PN} += "xserver-common login-manager"
+PR = "r1"
 
-INITSCRIPT_NAME = "gpe-dm"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+SRC_URI += "file://multi-lm.patch;patch=1"
 
diff --git a/packages/login-manager/.mtn2git_empty b/packages/login-manager/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/login-manager/.mtn2git_empty
diff --git a/packages/login-manager/files/.mtn2git_empty b/packages/login-manager/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/login-manager/files/.mtn2git_empty
diff --git a/packages/login-manager/files/login-manager b/packages/login-manager/files/login-manager
new file mode 100644
index 0000000000..6fbc307458
--- /dev/null
+++ b/packages/login-manager/files/login-manager
@@ -0,0 +1,104 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2005
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Date: 09-FEB-06
+
+
+LM_PATH="/etc/X11/login-managers"
+
+NO_KBD_LMS="gpe-dm"
+
+run_wm() {
+	if test -z "$1"
+	then
+		echo -e "\t* No valid login-managers found"
+		exit 0
+	fi
+	
+	echo "$1" > /tmp/_running_lm
+	echo -e "\t* Starting `basename "$1"`\n--\n"
+	"$1" start
+	
+	exit 0
+}
+
+get_valid_lms() {
+	if test "$HAS_KBD" = no
+	then
+		for lm in $NO_KBD_LMS
+		do	
+			if echo "$LM_FILES" | grep -iq "$lm"
+			then
+				test -x "$LM_PATH/$lm" && VALID_LMS="$VALID_LMS $lm" || echo -e "\t* Discarding [$lm]: Not executable"
+			
+			fi
+		done
+
+		if test  "`echo "$VALID_LMS" | wc -w | tr -d " "`" -gt 1
+		then
+			SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"				
+		else
+			SELECTED_LM="$VALID_LMS"				
+		fi
+		
+		
+	else
+		for lm in $LM_FILES
+		do
+			test -x "$LM_PATH/$lm" && VALID_LMS="$VALID_LMS $lm" || echo -e "\t* Discarding [$lm]: Not executable"
+		done	
+
+		if test  "`echo "$VALID_LMS" | wc -w | tr -d " "`" -gt 1
+		then
+			SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"				
+		else
+			SELECTED_LM="$VALID_LMS"				
+		fi
+	fi	
+}
+
+do_start(){
+#	DISPLAY_MODE="$(fbset | grep mode | sed -n "s/.*\"\(.*\)\-.*/\1/p")"
+	HARDWARE_MODEL="`cat /proc/cpuinfo | sed -n "s/^Hardware.*\:\ \(.*\)/\1/p"`"
+	LM_FILES="`ls -1 "$LM_PATH" | grep -v default`"
+
+	echo "$HARDWARE_MODEL" | grep -iq "SHARP" && HAS_KBD=yes || HAS_KBD="no"
+
+	echo "Launching login-manager"
+	echo -e "\t* Model has keyboard: $HAS_KBD"
+
+	# The user is always right
+	if test -x "$LM_PATH/default" >/dev/null 2>&1
+	then
+		echo "\t* Using default manager"
+		run_wm "$LM_PATH/default"
+	fi
+
+	get_valid_lms
+
+	echo -e "\t* Valid modes:$VALID_LMS"
+	
+	run_wm "$SELECTED_LM"
+}
+
+do_stop(){
+	echo "Stopping login-manager..."
+	`cat /tmp/_running_lm` stop
+	
+	for x in Xfbdev Xomap Xorg Xepson
+	do
+        	killall "$x" >/dev/null 2>&1
+	done
+}
+
+case "$1" in
+	start)		do_start;;
+	stop)		do_stop;;
+	restart)	do_stop
+			do_start;;		
+	*)		echo "Usage: `basename $0` [start|stop|restart]"
+			exit 0;;
+esac	
+
diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb
new file mode 100644
index 0000000000..04f8b34a8f
--- /dev/null
+++ b/packages/login-manager/login-manager.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+inherit update-rc.d
+
+DESCRIPTION = "Initscript for login-managers"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+PR = "r0"
+
+INITSCRIPT_NAME = "login-manager"
+INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
+
+SRC_URI = "file://login-manager"
+
+do_install() {
+	install -d ${D}/etc/init.d
+	install -m 0755 ${WORKDIR}/login-manager ${D}/etc/init.d/
+}		
+