GDM3 looks for .desktop files for the list of possible sessions, whereas GDM2 looked at /etc/X11/Sessions/, so put in a .desktop wrapper file pointing to the Xsession script.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 90 insertions, 12 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 65cfd5fecd29..e4f0d5a5f067 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.218 2011/10/03 17:55:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.219 2011/11/30 20:10:50 robbat2 Exp $
+
+*xinit-1.3.1-r1 (30 Nov 2011)
+
+  30 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +xinit-1.3.1-r1.ebuild,
+  +files/Xsession.desktop:
+  GDM3 looks for .desktop files for the list of possible sessions, whereas GDM2
+  looked at /etc/X11/Sessions/, so put in a .desktop wrapper file pointing to
+  the Xsession script.
 
   03 Oct 2011; Joseph Jezak <josejx@gentoo.org> xinit-1.3.1.ebuild:
   Marked ppc ppc64 stable for bug #380421.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index d49dd52292bc..df7d288fec05 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97
 AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e4354fa2ea0f8 SHA1 a538ef116aad391163853aa04586622515dc7c0d SHA256 3b43514ca65c882def485497917c67e64c570fa0c1ef8d758bd949d41e0f9a9c
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
+AUX Xsession.desktop 244 RMD160 45d43168e40de764607a6a2b612f1093ca26b12c SHA1 b0e95e00994021d9a7bbd7f7566f5da8cc1ccc00 SHA256 23eb4a681673217afae0ab7787a93ab7746ab0e8794eaf2564ea59894c36554c
 AUX chooser.sh 1301 RMD160 4ebebef5d48d0b344f1c8af8baac60ece9671a12 SHA1 67f1afc86fb2788c6d75713bfb37550820360b5e SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0
 AUX startDM.sh 923 RMD160 b457ea1bf2cb059a4faf5c98811589412c5026fc SHA1 b462b58ac0d76f0f5b1c8e3562da75d99488b7da SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499
 AUX xinit-1.3.1-prio-process.patch 357 RMD160 212206c365f6a0c501336670f12c36cb422d126f SHA1 655d41ef8e65baa7471589fc8fa424b65a0d07ff SHA256 64588930bab42c8492e5f647c8261e5bd9efd6e4e4e99f94cac18ce2ddefba07
@@ -11,13 +9,7 @@ AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3
 DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
 DIST xinit-1.3.1.tar.bz2 147067 RMD160 aadb0729c65438819cfaae4733f512574fa39c2d SHA1 6d3981c23ce49212a26912651d6d2473a5065766 SHA256 c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
 EBUILD xinit-1.3.0-r2.ebuild 1670 RMD160 6747e0a03a2228f5d42bab22a7265d77f8f5c8b8 SHA1 0ce712851536ceafc53355031e3b0c95984d8186 SHA256 6477c0a8deac0067f54ed00ebe3a6d13d0e10b99276b6a0673390017f9e3b38c
+EBUILD xinit-1.3.1-r1.ebuild 1790 RMD160 8487e8333ec2da4455c1f36519b99417102bf88a SHA1 23a9ea0da26e963fba99d1a31ad88cf8daa4a282 SHA256 8759f52c4bf9896592ee047e5b2550af0c66939d1bbf3c2e1d95e77a1bbe935a
 EBUILD xinit-1.3.1.ebuild 1706 RMD160 1442cc9c1965d73c86eebe54ee8f06c36f6b97c4 SHA1 a53077a4863b3de4db44762420ea0b078027f6f7 SHA256 3b1eb7bd90904ce81772cb231aa84307abd6c54906ab27d49a25a1a27614d4be
-MISC ChangeLog 33386 RMD160 f0d05f6add0431b0e4cc0cdf7af0034384df3536 SHA1 8bf788e7e5d37b2a8b7e80715c6b3661d8c989d0 SHA256 8d08bb6f2a8f7c65ea8803d5d593f18c5f1e60997664d91491a0c8b8d397e7af
+MISC ChangeLog 33704 RMD160 22710b82e607f948f53cae35104c9a46e5f1cbfb SHA1 27337dc909b886e8aa2a33ff6443ee6da4d9b98d SHA256 13f888d238f5ebcb5ab50f8dcc7a7e9ebe3c9dd54541de017a004fb8b363b3aa
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6J9y8ACgkQcsIHjyDViGS2DgCdHyxDd1KuZU6pQoO+H7PM3hLG
-zboAn2o5738zWS2A2LKqChSJ87/1G82J
-=sUe/
------END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
new file mode 100644
index 000000000000..4ed3a5cd8bd9
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=XSession
+Comment=This session logs you into your custom Xsession
+Exec=/etc/X11/Sessions/Xsession
+TryExec=/etc/X11/Sessions/Xsession
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-apps/xinit/xinit-1.3.1-r1.ebuild b/x11-apps/xinit/xinit-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..ce4bab4ed941
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1-r1.ebuild,v 1.1 2011/11/30 20:10:50 robbat2 Exp $
+
+EAPI=4
+
+inherit xorg-2
+
+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="+minimal"
+
+RDEPEND="
+	!<x11-base/xorg-server-1.8.0
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	!minimal? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-Gentoo-customizations.patch"
+	"${FILESDIR}/${P}-prio-process.patch"
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir=/etc/X11/xinit
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession
+	exeinto /etc/X11/xinit
+	doexe "${FILESDIR}"/xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/00-xhost"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/Xsession.desktop"
+}
+
+pkg_postinst() {
+	xorg-2_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"
+}