Added a patch kindly provided by zlin to allow for choosing any version of kdm. Prerequisite for KDE4.

(Portage version: 2.1.4)

5 files changed, 82 insertions, 4 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index d3d43ef237df..0596e2e6c048 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.111 2007/12/18 02:21:58 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.112 2008/01/13 22:27:31 philantrop Exp $
+
+*xinit-1.0.5-r2 (13 Jan 2008)
+
+  13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> files/xdm.confd-1,
+  files/xdm.initd-1, +xinit-1.0.5-r2.ebuild:
+  Added a patch kindly provided by zlin to allow for choosing any version of
+  kdm. Prerequisite for KDE4.
 
   18 Dec 2007; Jeroen Roovers <jer@gentoo.org> xinit-1.0.5-r1.ebuild:
   Stable for HPPA (bug #201998).
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.5-r2 b/x11-apps/xinit/files/digest-xinit-1.0.5-r2
new file mode 100644
index 000000000000..4cf812d44311
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-1.0.5-r2
@@ -0,0 +1,3 @@
+MD5 9a2aad51042141a0e6ad066015397595 xinit-1.0.5.tar.bz2 106673
+RMD160 3e28f5b5404751934c274cfc81d3b85c71d72e9e xinit-1.0.5.tar.bz2 106673
+SHA256 95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d xinit-1.0.5.tar.bz2 106673
diff --git a/x11-apps/xinit/files/xdm.confd-1 b/x11-apps/xinit/files/xdm.confd-1
index 6f1fd8ce1702..7b12413f4076 100644
--- a/x11-apps/xinit/files/xdm.confd-1
+++ b/x11-apps/xinit/files/xdm.confd-1
@@ -5,6 +5,8 @@
 # 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 | entrance ]
+# What display manager do you use ?  [ xdm | gdm | kdm | kdm-3.5 | kdm-4.0 | 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/.
 DISPLAYMANAGER="xdm"
diff --git a/x11-apps/xinit/files/xdm.initd-1 b/x11-apps/xinit/files/xdm.initd-1
index ed69c10413ba..6cd1c78b388a 100755
--- a/x11-apps/xinit/files/xdm.initd-1
+++ b/x11-apps/xinit/files/xdm.initd-1
@@ -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-1,v 1.3 2007/07/09 10:31:38 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-1,v 1.4 2008/01/13 22:27:32 philantrop Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -68,6 +68,10 @@ setup_dm() {
 			#PIDFILE=/var/run/kdm.pid
 			PIDFILE=
 			;;
+		kdm-*)
+			EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+			PIDFILE=
+			;;
 		entrance*)
 			EXE=/usr/sbin/entranced
 			PIDFILE=/var/lib/entranced.pid
diff --git a/x11-apps/xinit/xinit-1.0.5-r2.ebuild b/x11-apps/xinit/xinit-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..20a7214edf7b
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.5-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r2.ebuild,v 1.1 2008/01/13 22:27:31 philantrop Exp $
+
+# Must be before x-modular eclass is inherited
+# This is enabled due to modified Makefile.am from the patches
+SNAPSHOT="yes"
+
+inherit x-modular pam
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="hal minimal pam"
+
+RDEPEND="x11-apps/xauth
+	x11-libs/libX11
+	hal? ( sys-auth/consolekit )"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? ( x11-wm/twm
+				x11-apps/xclock
+				x11-apps/xrdb
+				x11-apps/xsm
+				x11-terms/xterm )"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization-1.0.4.patch
+	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+
+CONFIGURE_OPTIONS="$(use_with hal consolekit)"
+
+pkg_setup() {
+	if use hal; then
+		if ! built_with_use sys-apps/dbus X ; then
+			eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
+			die "You MUST build sys-apps/dbus with the X USE flag enabled."
+		fi
+	fi
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}/Makefile.am"
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession || die
+	exeinto /etc/X11/xinit
+	doexe "${FILESDIR}"/xinitrc || die
+	newinitd "${FILESDIR}"/xdm.initd-1 xdm
+	newconfd "${FILESDIR}"/xdm.confd-1 xdm
+	newpamd "${FILESDIR}"/xserver.pamd xserver
+}