diff options
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm.confd-1 | 2 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-2 | 6 |
3 files changed, 10 insertions, 3 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/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 |