Add GPE (gpe-dm) support.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 13 insertions, 6 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 8a40135f54e5..a855c036ddda 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.128 2009/05/15 15:26:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.129 2009/05/30 17:34:21 miknix Exp $
+
+  30 May 2009; Angelo Arrifano files/xdm.confd-1, files/xdm.initd-2:
+  Add GPE (gpe-dm) support.
 
   15 May 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r4.ebuild:
   arm/s390 stable
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 2dc0b1979fac..586c8823fa45 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -4,9 +4,9 @@ AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb2
 AUX gentoo-startx-customization-1.0.8.patch 3953 RMD160 cf0bc0b1439437b8a92a1f569445e8fbef1bb1cd SHA1 8020676fe7c9a2fed0c2a09cea0c273984a3cdc0 SHA256 29d6a004240672b86d6cc34e9cab5dcc88abcb84974d98b1085a9eb0dc852f38
 AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 SHA1 8210062a9e3bac93e9d5b0a18633e6a98a6829f4 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826
 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
-AUX xdm.confd-1 716 RMD160 e45d7b96d8f12a8d8156d120e9e16514aa38c2ab SHA1 db2612f9c45206ae04c77f14bf3bfe02896eab24 SHA256 2bb4db1bef1c5d16b80ac914447f99bf71bf11d430ac93cc3c8b38fae3bccb72
+AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3
 AUX xdm.initd-1 5207 RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 SHA1 faefdeeca446fff29da2f4e546a3b0bcc94e6372 SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea
-AUX xdm.initd-2 5210 RMD160 d553381a62b0f84694794257b532a01a90319a8c SHA1 47a99e43ffeeb7cd8a2c8a2d9bb240b40731d4ea SHA256 0e7e0bbb5de5ebc0a94ca7d8da61e54caf68ed2c34e523e698b959ee47c3d837
+AUX xdm.initd-2 5279 RMD160 f811f26f807673141932d38a33fd97a296d58dca SHA1 393ffe5f453be37395bcf997434d53939ed2b2ed SHA256 87461b8f02a1c0258a4be914899e0e862d014b155b69dbc023940835d1306427
 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded
 AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
@@ -22,5 +22,5 @@ EBUILD xinit-1.0.8-r2.ebuild 1795 RMD160 5af656de1216810164bec4e7cfe27337bbe9db3
 EBUILD xinit-1.0.8-r3.ebuild 1924 RMD160 daea591250fc80d64032be5b32aa641375b91cde SHA1 8982722c65ddcd5f3ac2f39ec587e05c521e5b59 SHA256 2b3da814a3367dbd9b8a53cc61a71adea7b6778d58ac8955a7f31d71b73d5637
 EBUILD xinit-1.0.8-r4.ebuild 2350 RMD160 1066ec2f04501b9b4f080e32a38b22c4c0c28e27 SHA1 d062bd6c80d73846aa7f442655b81e04ba8d6cd2 SHA256 00ee7b7e53365e09e2c55328b7d586edded319047c85a50b7fbbbf2c0a6a09ec
 EBUILD xinit-1.0.8.ebuild 1743 RMD160 e69d30cd92810870fbb9bf4f0896778c4e162c30 SHA1 9704fa014525f1e45dddcc658d6d83990e21961a SHA256 8ed635360a4136209fe0249c53bd3254367957dec543a5f1a1f1b06fc8cefd63
-MISC ChangeLog 20191 RMD160 424bcf3cefa97e505291d0024087a2a3bcef49bc SHA1 73caeb1ea205e20aa1391636ca1a0e13d93aac47 SHA256 799f271d8c6a76ff9f93296465292aac273b12e87b5d7726855883f7a996d652
+MISC ChangeLog 20288 RMD160 5e58d90c0b7bb15cd04a997af3023d6c7db6e645 SHA1 2b333f2289eb64a7eb651a3e75d18860b36523e5 SHA256 2845da7aa752aeb254c3a9c32a41d997db737b3add6bc762495c5bd3b5ebd820
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/xinit/files/xdm.confd-1 b/x11-apps/xinit/files/xdm.confd-1
index 7b12413f4076..aa1219e02a9a 100644
--- a/x11-apps/xinit/files/xdm.confd-1
+++ b/x11-apps/xinit/files/xdm.confd-1
@@ -5,7 +5,7 @@
 # in your /etc/inittab file so that you don't get a dead keyboard.
 CHECKVT=7
 
-# What display manager do you use ?  [ xdm | gdm | kdm | kdm-3.5 | kdm-4.0 | entrance ]
+# What display manager do you use ?  [ xdm | gdm | kdm | kdm-3.5 | kdm-4.0 | gpe | entrance ]
 # NOTE: If this is set in /etc/rc.conf, that setting will override this one.
 # KDE-specific note: kdm-3.5 and kdm-4.0 are just examples. You will find all 
 # possible versions by looking at the directories in /usr/kde/.
diff --git a/x11-apps/xinit/files/xdm.initd-2 b/x11-apps/xinit/files/xdm.initd-2
index 5bbee1243aec..5f6b4696ecab 100755
--- a/x11-apps/xinit/files/xdm.initd-2
+++ b/x11-apps/xinit/files/xdm.initd-2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v 1.1 2008/05/06 08:16:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v 1.2 2009/05/30 17:34:21 miknix Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -85,6 +85,10 @@ setup_dm() {
 			EXE=/usr/bin/wdm
 			PIDFILE=
 			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
 		*)
 			EXE=
 			# Fix #65586, where MY_XDM is empty so EXE=somedir