summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2011-11-06 10:54:09 +0100
committerTomas Chvatal <tchvatal@suse.cz>2011-11-06 10:54:09 +0100
commitd58aa8118dbd97bf890f96c73f71e2a0bd6f240e (patch)
treee728ac9a7089f68cab03b3becd83a0259c6e064f /x11-base
parentx11-libs/libdrm: rename solaris patch (diff)
downloadx11-d58aa8118dbd97bf890f96c73f71e2a0bd6f240e.tar.gz
x11-d58aa8118dbd97bf890f96c73f71e2a0bd6f240e.tar.bz2
x11-d58aa8118dbd97bf890f96c73f71e2a0bd6f240e.zip
Remove the kdeprefix specific notes from xdm config as it is gone.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/files/xdm.confd-4 (renamed from x11-base/xorg-server/files/xdm.confd-3)10
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild2
2 files changed, 3 insertions, 9 deletions
diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-4
index 9c560bb1..c82fece0 100644
--- a/x11-base/xorg-server/files/xdm.confd-3
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,12 +5,6 @@
# 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-4.3 | gpe | entrance ]
+# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-#
-# KDE-specific note:
-# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3".
-# You can find possible versions by looking at the directories in /usr/kde/.
-# - Else, if you are using KDE 3 enter "kdm-3.5"
-# - Else, if you are using KDE 4 enter "kdm" without a version
-DISPLAYMANAGER="xdm" \ No newline at end of file
+DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 79c39f36..3947705f 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -184,7 +184,7 @@ src_install() {
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
newinitd "${FILESDIR}"/xdm.initd-3 xdm
- newconfd "${FILESDIR}"/xdm.confd-3 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
insinto /usr/share/portage/config/sets