(#220797) Instead of letting settings in /etc/env.d/90xsession get overwritten on every update, don't install anything there and just tell people what to do.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 89 insertions, 6 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 73982e909310..a30d2dd49001 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.117 2008/05/12 08:34:27 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.118 2009/02/10 02:49:00 dberkholz Exp $
+
+*xinit-1.0.8-r4 (10 Feb 2009)
+
+  10 Feb 2009; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xinit-1.0.8-r4.ebuild:
+  (#220797) Instead of letting settings in /etc/env.d/90xsession get
+  overwritten on every update, don't install anything there and just tell
+  people what to do.
 
   12 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xinit-1.0.8-r3.ebuild:
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 850728930c4e..35c45872dd31 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -23,13 +23,14 @@ EBUILD xinit-1.0.5-r1.ebuild 1729 RMD160 d7e9031746b070bf3366d94fb585d0f84b7e7d1
 EBUILD xinit-1.0.5-r2.ebuild 1743 RMD160 fce35ecc6a8814d9778110827b29321a2ef19261 SHA1 a2a28809ad66a9db931b4a3b65f2b503f5bff22f SHA256 d0d94c8a6b98bf1278294261694d9657e305fe773ba81710b98c6fcfef3cdebb
 EBUILD xinit-1.0.8-r2.ebuild 1791 RMD160 f2051886d03dcd5a0b41a5590f34f5471b56db37 SHA1 c231b0607108e9c7d964d49c180a58bfff3ad209 SHA256 1ac009b9b8fc2e7159e578c5baaa98d1e768c4547d5d5e799b07e35b4779221b
 EBUILD xinit-1.0.8-r3.ebuild 1920 RMD160 8a6be3ad6c605041142cd43c7b13d3ef471b9045 SHA1 75bb79972cd42487dad6d2707732c60ab77f3448 SHA256 2b474686cbc3c89eab4832be5fe41dcea1dc5fbe3139c579380b1aacf24c6192
+EBUILD xinit-1.0.8-r4.ebuild 2353 RMD160 6d4c5024953011747961564922be4721dc3dd546 SHA1 47f5ff64932207fd744ff603d2843ebc6fd4d3fd SHA256 efa6c0da5a3bddc5ec06571a30fbb41f6bd68fab3fd349445c775e60de845e1e
 EBUILD xinit-1.0.8.ebuild 1739 RMD160 6c7fb9fc66ae8930f5e58db44eb081ef2c372565 SHA1 5de2601dbce6f5560b3cae7050dbe95f633d9ffe SHA256 28501ccb5b255dd3e1e61fbe3cc0bdcc6b7d15907b8f82943fee9f6d7a939677
-MISC ChangeLog 18586 RMD160 5a91deeaffe755f03b4c9da51002c306c5e5bf43 SHA1 909189c5d185e5bd5d702d7a8769cebcb1872e1f SHA256 670430d5b6ecf26c7c1db87a30666e17d91df61e8385cceb4bdadc0d6ef7cf41
+MISC ChangeLog 18863 RMD160 d800c6eb0dc812249512499ba66848324e0031dd SHA1 31ce6b4a64425806b27d8a371ebc356c31eb68af SHA256 5565581c264d06ba5cd696af5e0f40e9e396f25b42e24be579fbbc615c84c156
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgoARsACgkQXVaO67S1rttETgCeI+eUyb0fKYz8Yl1P07gkK1KT
-ZGQAoJAWFEQfe9ikfIYnR45hNUkEyFv1
-=UjHv
+iEYEARECAAYFAkmQ6yIACgkQXVaO67S1rtuCvACfWm9ZtMHBSSohfu8CQDZuRK0K
+7pMAnRIrWw/rLu/TMyTPo2YApO+w44ln
+=qYgr
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.0.8-r4.ebuild b/x11-apps/xinit/xinit-1.0.8-r4.ebuild
new file mode 100644
index 000000000000..fe4c525bdf08
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.8-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/02/10 02:49:00 dberkholz 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-2 xdm
+	newconfd "${FILESDIR}"/xdm.confd-1 xdm
+	newpamd "${FILESDIR}"/xserver.pamd xserver
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+	ewarn "any executable. When you run startx, it will run this as the login session."
+	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+	ewarn "Here's an example of setting it for the whole system:"
+	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+	ewarn "    env-update && source /etc/profile"
+}