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

Package-Manager: portage-2.1.4

6 files changed, 101 insertions, 26 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/Manifest b/x11-apps/xinit/Manifest
index cb0f5db337c7..407ba5b11ac0 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 files/Xsession 2187
@@ -21,14 +18,14 @@ AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb
 MD5 42e1e329b9566a4756c7931d3f4c301b files/startDM.sh 858
 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 files/startDM.sh 858
 SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 files/startDM.sh 858
-AUX xdm.confd-1 553 RMD160 ed01c98bd9e669c7ef4b31e8084c26feacdd7456 SHA1 8e3c7739c1446f9568c20c7266e9ebd74b9157d4 SHA256 0e58beab8245a12c5fbcb3c450d78f5cf0cfe9f2820d5e8914da4e4acde1569d
-MD5 e878f0ef27c8c7e3e6fa274de5189eb3 files/xdm.confd-1 553
-RMD160 ed01c98bd9e669c7ef4b31e8084c26feacdd7456 files/xdm.confd-1 553
-SHA256 0e58beab8245a12c5fbcb3c450d78f5cf0cfe9f2820d5e8914da4e4acde1569d files/xdm.confd-1 553
-AUX xdm.initd-1 5137 RMD160 c4bd933ba335a853ff91a5f001d50d65e0c94166 SHA1 3710e0c725043a08ac73cd7392cc5f6246bd11d3 SHA256 11fd8d2a16b94ab5e81e50abe45b4718b3d44806872f20e946e736e011c1155f
-MD5 309243eb1edbd7243819bbce9d4421d5 files/xdm.initd-1 5137
-RMD160 c4bd933ba335a853ff91a5f001d50d65e0c94166 files/xdm.initd-1 5137
-SHA256 11fd8d2a16b94ab5e81e50abe45b4718b3d44806872f20e946e736e011c1155f files/xdm.initd-1 5137
+AUX xdm.confd-1 716 RMD160 e45d7b96d8f12a8d8156d120e9e16514aa38c2ab SHA1 db2612f9c45206ae04c77f14bf3bfe02896eab24 SHA256 2bb4db1bef1c5d16b80ac914447f99bf71bf11d430ac93cc3c8b38fae3bccb72
+MD5 e89109dc3aeb55b7a5c466e7a4e2fbca files/xdm.confd-1 716
+RMD160 e45d7b96d8f12a8d8156d120e9e16514aa38c2ab files/xdm.confd-1 716
+SHA256 2bb4db1bef1c5d16b80ac914447f99bf71bf11d430ac93cc3c8b38fae3bccb72 files/xdm.confd-1 716
+AUX xdm.initd-1 5207 RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 SHA1 faefdeeca446fff29da2f4e546a3b0bcc94e6372 SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea
+MD5 aae06c08ecc90975e2b43796974ec381 files/xdm.initd-1 5207
+RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 files/xdm.initd-1 5207
+SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea files/xdm.initd-1 5207
 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded
 MD5 5dd1b14c1942c59025be5fa7d470f281 files/xdm.start 3974
 RMD160 67f3b69fc9c006146999271935e1ae06d093130a files/xdm.start 3974
@@ -55,10 +52,14 @@ EBUILD xinit-1.0.5-r1.ebuild 1729 RMD160 d7e9031746b070bf3366d94fb585d0f84b7e7d1
 MD5 352978f7c83088f18ea16ea1261dc1f9 xinit-1.0.5-r1.ebuild 1729
 RMD160 d7e9031746b070bf3366d94fb585d0f84b7e7d18 xinit-1.0.5-r1.ebuild 1729
 SHA256 dfab86c85357be16beb2a9bbd5616ab1ba7fdf9bbd9e5fbf6fd5358a22d202b8 xinit-1.0.5-r1.ebuild 1729
-MISC ChangeLog 17361 RMD160 62aec3cc3e77ab3aa2dd6a3a86e659844d834b91 SHA1 d566845af105e49c81fbf5fab4b091974a705f90 SHA256 c7208037bddd592d8a3fc29c040711ffb165c888d641c07927595a7d95112413
-MD5 0da65cae14c64e4c34f7943c92f76e1c ChangeLog 17361
-RMD160 62aec3cc3e77ab3aa2dd6a3a86e659844d834b91 ChangeLog 17361
-SHA256 c7208037bddd592d8a3fc29c040711ffb165c888d641c07927595a7d95112413 ChangeLog 17361
+EBUILD xinit-1.0.5-r2.ebuild 1743 RMD160 fce35ecc6a8814d9778110827b29321a2ef19261 SHA1 a2a28809ad66a9db931b4a3b65f2b503f5bff22f SHA256 d0d94c8a6b98bf1278294261694d9657e305fe773ba81710b98c6fcfef3cdebb
+MD5 12ee725040be0bba3334e22ec13c727f xinit-1.0.5-r2.ebuild 1743
+RMD160 fce35ecc6a8814d9778110827b29321a2ef19261 xinit-1.0.5-r2.ebuild 1743
+SHA256 d0d94c8a6b98bf1278294261694d9657e305fe773ba81710b98c6fcfef3cdebb xinit-1.0.5-r2.ebuild 1743
+MISC ChangeLog 17626 RMD160 bc7b7d254213877527f67ff8f7872c5911172ce8 SHA1 cc06cab008798e01203be128ec1d4c9ed9f7c1d4 SHA256 43ec1cc5038214cbe4f59e1538192b5e62248fd60075450dc074713241249d35
+MD5 2308428adf4cbbbc2a97dacf06818ac5 ChangeLog 17626
+RMD160 bc7b7d254213877527f67ff8f7872c5911172ce8 ChangeLog 17626
+SHA256 43ec1cc5038214cbe4f59e1538192b5e62248fd60075450dc074713241249d35 ChangeLog 17626
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -69,10 +70,6 @@ SHA256 9232f41ed855c86ed71c95e580340c1b865ee6e1e9a548bf5c098eebaaf04ff6 files/di
 MD5 5222117bd1e59dd288e0db4cfc5f72e6 files/digest-xinit-1.0.5-r1 238
 RMD160 57dea650c2000957b4d74f7bc2a8995ef0373031 files/digest-xinit-1.0.5-r1 238
 SHA256 29a4fe681a6f9fc87e3ee93fa3827d85ad73aaeefa916b08a6ec90f16ec42606 files/digest-xinit-1.0.5-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkeJ2+EACgkQj9hvisErhMJGHACcCIb21pDGzoKRX6p1qv5WMa7l
-wYUAoLiL0Q+4x+2WyNRr3rpnqxLzmFih
-=Iox2
------END PGP SIGNATURE-----
+MD5 5222117bd1e59dd288e0db4cfc5f72e6 files/digest-xinit-1.0.5-r2 238
+RMD160 57dea650c2000957b4d74f7bc2a8995ef0373031 files/digest-xinit-1.0.5-r2 238
+SHA256 29a4fe681a6f9fc87e3ee93fa3827d85ad73aaeefa916b08a6ec90f16ec42606 files/digest-xinit-1.0.5-r2 238
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
+}