[gpe-xsession/gpe-dm] Use /etc/init.d/xdm and /etc/X11/gpe/ instead.

4 files changed, 82 insertions, 0 deletions

diff --git a/gpe-xsession/gpe-dm/Manifest b/gpe-xsession/gpe-dm/Manifest
index 076931c..90485b8 100644
--- a/gpe-xsession/gpe-dm/Manifest
+++ b/gpe-xsession/gpe-dm/Manifest
@@ -1,2 +1,5 @@
+AUX Xinit 551 SHA1 9489f3175dff18dc3acb117dab68ce76ba59142c SHA256 9bdbab2a92db4de1057c836d884eff129febb0e2412eb9e099a8a6b0532777e1
+AUX gpe-dm-noinitd.patch 574 SHA1 e761a112821782b90ea856c3ce93a7dadfe93b22 SHA256 60b648538c93808e977ad7a7c73118691402877a38e2c189e53502cc301da1a7
 DIST gpe-dm-0.51.tar.bz2 110734 SHA1 53c667da7129609582e8031f37c33c8441d5f4f1 SHA256 4f7546bc5f8df7eb9511b919e34eb08945db4359fd3db07c555b83959923a1cf
+EBUILD gpe-dm-0.51-r1.ebuild 766 SHA1 90a3bc239d363afc43cd6be1729016fd59445aa5 SHA256 0e21e865553e9f15a04481846ec1dea982a265cf197030f646d1da1e5b65e75a
 EBUILD gpe-dm-0.51.ebuild 344 SHA1 4b70a9bfe45b4f509a7375766c9f3be0077339cf SHA256 15062095f9a6e0a63ec83c2a6c94d7e3139e6ca5d003813f662215b0e8af2921
diff --git a/gpe-xsession/gpe-dm/files/Xinit b/gpe-xsession/gpe-dm/files/Xinit
new file mode 100644
index 0000000..e957a5c
--- /dev/null
+++ b/gpe-xsession/gpe-dm/files/Xinit
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copied from gpe xserver-common
+
+export USER=root
+export HOME=/home/root
+if [ ! -d $HOME ] && [ -d /root ]; then
+  HOME=/root
+fi
+export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
+export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+
+export PATH=$PATH:/usr/X11R6/bin
+
+SYSSESSIONDIR=/etc/X11/Xinit.d
+
+exec run-parts $SYSSESSIONDIR
diff --git a/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch b/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch
new file mode 100644
index 0000000..237f36c
--- /dev/null
+++ b/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch
@@ -0,0 +1,24 @@
+--- Makefile.am.old	2009-05-04 23:00:46.000000000 +0000
++++ Makefile.am	2009-05-04 23:01:10.000000000 +0000
+@@ -11,11 +11,7 @@
+ 
+ gpe_dm_SOURCES = gpe-dm.c
+ 
+-initdir = $(sysconfdir)/init.d
+-init_SCRIPTS = gpe-dm.init
+-
+ EXTRA_DIST = \
+-             $(init_SCRIPTS) \
+              intltool-extract.in \
+              intltool-merge.in \
+              intltool-update.in
+@@ -25,9 +21,6 @@
+                  intltool-merge \
+                  intltool-update
+ 
+-install-data-hook:
+-	cd $(DESTDIR)$(sysconfdir)/init.d && mv gpe-dm.init gpe-dm
+-
+ clean-local:
+ 	rm -f *.d *~
+ 
diff --git a/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild b/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild
new file mode 100644
index 0000000..208d3ad
--- /dev/null
+++ b/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+GPE_TARBALL_SUFFIX="bz2"
+inherit eutils gpe autotools
+
+DESCRIPTION="GPE Desktop Manager"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	${RDEPEND}"
+
+src_unpack() {
+	gpe_src_unpack "$@"
+
+	# The default path is ugly and might confuse people with
+	# /etc/X11/xinit
+	sed -i -e 's;/etc/X11;/etc/X11/gpe;' gpe-dm.c \
+		|| die "Failed to sed file gpe-dm.c"
+
+	# Dont use /etc/init.d/gpe-dm, use
+	# /etc/init.d/xdm instead
+	epatch "${FILESDIR}/${PN}-noinitd.patch" 
+	eautoreconf
+}
+
+src_install() {
+	gpe_src_install "$@"
+
+	dodir /etc/X11/gpe/Xinit.d
+	exeinto /etc/X11/gpe
+	doexe ${FILESDIR}/Xinit
+}