merge of 160720a48fbbbc4d952d090bb639c0f278e17f2f

     and 558bb65faf7c2974476686b49c96141cd99dd145

6 files changed, 66 insertions, 2 deletions

diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 672f05594b..65d9482c02 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Entrace is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus x11-common"
+DEPENDS = "edb evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common"
 RDEPENDS += "bash keylaunch detect-stylus x11-common"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
            file://Xserver.patch;patch=1 \
diff --git a/packages/gpe-dm/gpe-dm_0.48.bb b/packages/gpe-dm/gpe-dm_0.48.bb
new file mode 100644
index 0000000000..8cd6c2bea4
--- /dev/null
+++ b/packages/gpe-dm/gpe-dm_0.48.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+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"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
diff --git a/packages/gpe-login/gpe-login_0.82.bb b/packages/gpe-login/gpe-login_0.82.bb
new file mode 100644
index 0000000000..594bde73c3
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.82.bb
@@ -0,0 +1,11 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Philip Blundell <pb@handhelds.org>"
+DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS    = "xkbd"
+RPROVIDES   = "gpe-session-starter"
+PR = "r0"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
new file mode 100644
index 0000000000..e43f32ef82
--- /dev/null
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
@@ -0,0 +1,30 @@
+LICENSE = "GPL"
+PR = "r0"
+
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
+# more rdepends: keylaunch ipaq-sleep apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+
+SRC_URI += "file://matchbox-session \
+	file://disable-composite.xsetting"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+	fi
+	install -d ${D}${sysconfdir}/matchbox
+	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/xserver-common/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-common/.mtn2git_empty
diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb
new file mode 100644
index 0000000000..877ec8fa4e
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+# we are using a gpe-style Makefile
+inherit gpe