add /etc/env.d/90xsession file

Package-Manager: portage-2.1.5_rc2

4 files changed, 102 insertions, 6 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 2511fa6b88d2..28ee6aa489c0 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.113 2008/03/10 01:58:15 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.114 2008/04/08 20:45:37 cardoe Exp $
+
+*xinit-1.0.8-r1 (08 Apr 2008)
+
+  08 Apr 2008; Doug Goldstein <cardoe@gentoo.org> +files/xsession.env.d,
+  +xinit-1.0.8-r1.ebuild:
+  add /etc/env.d/90xsession file
 
 *xinit-1.0.8 (10 Mar 2008)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 010166940757..4e9af49d7590 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -13,19 +13,21 @@ AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84
 AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
+AUX xsession.env.d 1146 RMD160 876f5de1da358d796cbc6563e29cb9832e150e24 SHA1 d9390b8c4b4432e2e0131bec686c14557086a534 SHA256 56c732b131072376e8649efd16072461b21c9973d89bb125c95d793002c1a924
 DIST xinit-1.0.4.tar.bz2 106555 RMD160 7a3fd5930dcb88c101842bcf9599de4632d9fed1 SHA1 cad1f17464f48e3c08f2d76af1206004cbdfa731 SHA256 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
 DIST xinit-1.0.5.tar.bz2 106673 RMD160 3e28f5b5404751934c274cfc81d3b85c71d72e9e SHA1 c6cc673205eae7cee11cab212d545ef8d6135019 SHA256 95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d
 DIST xinit-1.0.8.tar.bz2 117049 RMD160 d01b299e6e96c2b5318aaec479c81670b94e2129 SHA1 0102d2fdc0df3d24077ba826cf57640da46140af SHA256 06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
 EBUILD xinit-1.0.4.ebuild 1329 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 SHA1 e64fac34995fa69ff0bb1495ed08bcc0737c368b SHA256 660abed7cdf4a5e8cc8d5b7ce696e4c5c4252ac23417f6acb323edbe157612c9
 EBUILD xinit-1.0.5-r1.ebuild 1729 RMD160 d7e9031746b070bf3366d94fb585d0f84b7e7d18 SHA1 45d68f717dd260b504fa9c96214b260175a3229c SHA256 dfab86c85357be16beb2a9bbd5616ab1ba7fdf9bbd9e5fbf6fd5358a22d202b8
 EBUILD xinit-1.0.5-r2.ebuild 1743 RMD160 fce35ecc6a8814d9778110827b29321a2ef19261 SHA1 a2a28809ad66a9db931b4a3b65f2b503f5bff22f SHA256 d0d94c8a6b98bf1278294261694d9657e305fe773ba81710b98c6fcfef3cdebb
+EBUILD xinit-1.0.8-r1.ebuild 1788 RMD160 065412380e0fe9d0a8708e1e91d67b150ecd30fa SHA1 22158b452d068e91bc11caee373d592d30243d58 SHA256 b2de549027f09dba7f980a785e38721321efa70be0e547fb835979ec1c62155c
 EBUILD xinit-1.0.8.ebuild 1739 RMD160 6c7fb9fc66ae8930f5e58db44eb081ef2c372565 SHA1 5de2601dbce6f5560b3cae7050dbe95f633d9ffe SHA256 28501ccb5b255dd3e1e61fbe3cc0bdcc6b7d15907b8f82943fee9f6d7a939677
-MISC ChangeLog 17788 RMD160 8804d3f2129e6aa578325d8460357109adde2617 SHA1 7e17117ec6cf8b2fc4ad9b22df6f8bbd95574f42 SHA256 0f03cb7cda3276607ad181a6e6dac7a654c1a086feabd85e4be126384e8a6205
+MISC ChangeLog 17949 RMD160 d43af03c81adac2c4d41d586dd64ed027ba6c4b7 SHA1 fffbd97f1496304133c0aedcfd49f3d23096e021 SHA256 9c575560fa9c2b06b8c9e3771ff2b334c8ee7614f424fe06f96d33286c2b61db
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH1JW9XVaO67S1rtsRAlp2AKD2tv6/x1pS0had86eWUwJp3daSqQCePeeY
-rZPU2lw32GhiSPPYNVtuNfI=
-=ZWKP
+iEYEARECAAYFAkf72aUACgkQoeSe8B0zEfyRqQCfeZZcX5Y3U7UGd9RmbOb5DOOg
+AxoAn0bi2ukzvkk+lFw1ks2euDT10i2u
+=CtGN
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/xsession.env.d b/x11-apps/xinit/files/xsession.env.d
new file mode 100644
index 000000000000..c108d3d44e48
--- /dev/null
+++ b/x11-apps/xinit/files/xsession.env.d
@@ -0,0 +1,25 @@
+# /etc/env.d/90xsession
+
+# XSESSION is a new variable to control what window manager to start
+# default with X if run with xdm, startx or xinit.  The default behavior
+# is to look in /etc/X11/Sessions/ and run the script in matching the
+# value that XSESSION is set to.  The support scripts are smart enough to
+# look in all bin directories if it cant find a match in /etc/X11/Sessions/,
+# so setting it to "enlightenment" can also work.  This is basically used
+# as a way for the system admin to configure a default system wide WM,
+# allthough it will work if the user export XSESSION in his .bash_profile, etc.
+#
+# NOTE:  1) this behaviour is overridden when a ~/.xinitrc exists, and startx
+#           is called.
+#        2) even if ~/.xsession exists, if XSESSION can be resolved, it will
+#           be executed rather than ~/.xsession, else KDM breaks ...
+#
+# Defaults depending on what you install currently include:
+#
+# Gnome - will start gnome-session
+# kde-<version> - will start startkde (look in /etc/X11/Sessions/)
+# Xfce4 - will start a XFCE4 session
+# Xsession - will start a terminal and a few other nice apps
+
+#XSESSION="Gnome"
+
diff --git a/x11-apps/xinit/xinit-1.0.8-r1.ebuild b/x11-apps/xinit/xinit-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..67dfff374a83
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.8-r1.ebuild
@@ -0,0 +1,63 @@
+# 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.8-r1.ebuild,v 1.1 2008/04/08 20:45:37 cardoe 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.8.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
+	newenvd "${FILESIDR}"/xsession.env.d 90xsession
+}