Support $XDG_VTNR for setting vt -parameter to /usr/bin/X launch wrt #451956 for use of systemd-logind by Mike Gilbert

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 90 insertions, 11 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 80b158a54501..8f02394842e8 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.252 2014/03/14 12:17:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.253 2014/03/14 12:34:00 ssuominen Exp $
+
+*xinit-1.3.3-r1 (14 Mar 2014)
+
+  14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> +xinit-1.3.3-r1.ebuild,
+  files/xserverrc:
+  Support $XDG_VTNR for setting vt -parameter to /usr/bin/X launch wrt #451956
+  for use of systemd-logind by Mike Gilbert
 
   14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> files/Xsession.desktop:
   Punt deprecated Encoding= line from .desktop file
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 601ea9b92dbb..93594242503c 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,21 +8,22 @@ AUX Xsession.desktop 229 SHA256 68cc432e350e4c6a94dc5b9d4e6659382a92d8a76b6b3085
 AUX chooser.sh 1301 SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0 SHA512 e977e614769b126eac08e989057deb5375f4357de1383d17bd11ceb87eec1ab89c91cb992a89c5a09b8056c725f804838fdeffadcc06f7f6ca69c737b48f3206 WHIRLPOOL f87da2ccddf341261ff0d9565f04db0410d487a90ae447cbfbc5a3981865bdcd28487954657dbf70567ba65d8e0eec067d9efa6a717d89747eb06ea67de2dc3d
 AUX startDM.sh 923 SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499 SHA512 462090c2cbef56586018c8d6100e14002d4c74ee423cc66f6ce676ce7bb5a9ac8e17fd9b86bd66653aa266cef09106ab280b61e3d64ed0831eecd89b6715b890 WHIRLPOOL 709716dd54bda18538fd1b7d6b0e1d75fc5e51c9019dad9ff4bdc9a087cecba2d917b4fe820e2cfde029f34feca9ea556144a87381348c0483a1ea8dae9f17f8
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95
-AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
+AUX xserverrc 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c
 DIST xinit-1.3.2.tar.bz2 148443 SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235 SHA512 bafe4706ee09b7980518af54dbc7d4cb971fcf4aaf4ea575d58c7102258e63a838c7e4acd6a4267d10fb8253dd779c1a008a8ab64164442b902bc0b19716197a WHIRLPOOL 0ba7b3a3aacbd8aa47e03e9346aca651dc00efc0420bc6d3fbb6dd388428af0ecfb3cdc7d91a495a0be6b8236fda4a229b0311dc6c037f435e95f2350dfcf1f8
 DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
 EBUILD xinit-1.3.2.ebuild 1784 SHA256 90fc46f11bc86987d48074e76164f6408c781a30d2129076685cbf6b94e5c8c4 SHA512 20c4c9f8439da47cba8c112436bbdf6db3778abd87c0e325aee91b7f48ee965cbe7e607efbd74519f795df642ab8df306bba785d10f39195196487a9506986df WHIRLPOOL 1d52ae482fee4d5bad31a77f77c52486b3576041cfb94759510a783157c20db7b8f794504597bff03d259231d691cedb7ee208fdb3bd74de0624290fd8b6a814
+EBUILD xinit-1.3.3-r1.ebuild 1801 SHA256 6033193a0f12222e87bcb7f4e67328860ae66fce5d791a54ac3556efd6801108 SHA512 39a00fcc131606127ac56e7f8e7292d83c07571e3531706037ef3f83f7da0277bd93b1e5a66341a98686eb34b8ff643105c33617dad8db2b12ca1b61b68ecc31 WHIRLPOOL 933d28c4f35b6c21e2ceb236c154729697ea96e1bb263cba90d2f1dfc72e8967de3bee725febd75a117a2fb0f73900ca42a07bb6946865f6df02d161b4a3aa66
 EBUILD xinit-1.3.3.ebuild 1784 SHA256 786de825478f286838c7f77e1359c1e12efdf6861a93fc6015ef8cc4507012e6 SHA512 de3a7423c8ea9d024924bad079d83f33516430cc9c0884904d75b48b985747b33ee7c9ddc59bec2dc97a68634936a14929490c4c830c87564e64aa8f7c058368 WHIRLPOOL 2bedc6740bb7b303b729ac2059eda91ab5242f705c57518e9dadd2cb23f5fba3a6f07e19d07af653e86c88cae9e68b47c7b2440c8309ca88ffba998ffe18f7b4
-MISC ChangeLog 37576 SHA256 9fbe92871f2d16f22a3e5524c23fc26637048706062ab0ed1af632a6542a7c79 SHA512 85ea76b07fe31bae20ac898fd2cdb470b9c18e51f22ba4113f31e4092dd3a7d2ba82345e7b1b4ca89de0ebbb624b0e2eda8c351d395126237b3f6ba66fa883f8 WHIRLPOOL 66d0c1f43b36386232b9e183b26d484984c532436cf21526341b9d53059556111823b0c1599b829e534936d6967d1fe8c4ea71733d8c6215cf276da80dbfa55a
+MISC ChangeLog 37828 SHA256 4ecd4c1f470582c2d8de18150c95c223c18afffa9d869e2a1476840743b02d9a SHA512 713c9a0679a3719fdea6c11dbc197ee78fcb2b22d3e19e86b35c76913abaed7c55133e0898c9820fe145e2aa38399104ec83ffbb9c6887e887caa06f03958fba WHIRLPOOL efba51a83f025c69ce688a3d43159e5f0a2c74fa3f762cbd88b7a77af95ef364f2cdba4e2fac5c1f16e53ad8f33fbff6e4a14287d0d677b8edfcfa8941ac974f
 MISC metadata.xml 403 SHA256 8b907c5c30247ef4cb17fcf9dbaead16f3e6fd3b112d331b686cd6accd410f08 SHA512 6d64681045ad9dfe42c54d9e625a7b2f120eadd223d753ac79483aef5f03b819104168b9b5124244ce825bbe2a69ca32b1bc8176b85d42694a7b0f94f840c915 WHIRLPOOL e6ece8bf3d45c1697a8ca62a34360f5966bb07d2f938a606fefbcf474c4ba9a94356f824f1b6bf8dd7be0c7be169eee163de8dc1b9f000822ea808b6d8d567e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTIvJXAAoJEEdUh39IaPFNw9wIAKLs9Jg15OuNBebW/JLVZaC7
-wz0s8UqweoXacTqaGru+rPv3y9429aLgCANPz4Y5ttHA3XKFha8HHo/Ih3p+KkO0
-3DfZFHaPfdVij/N9N4Wypx3RSOHM8lKdcilKxVc8Rmn40RGxZu0KCzs3wcgkcMLe
-E+DCEUjvz56kP1xpEGzirkXmpS6kzqlFB8UIo2GPnsrLZioMuthnMaLb02gzB8d1
-q0D+dQlzTpnOjFgyjFoKpwu8zl8n3TkW2eF2kellAI71DU7I1X8lZkDVRRS6G6Bc
-M4mAbleuAIxzv++/TDpy+JK+xdVmzMjDgi3tQKGhPV6fSIR5YSAAiGdX1tqF3GQ=
-=tZaK
+iQEcBAEBCAAGBQJTIvZQAAoJEEdUh39IaPFNW+oH/A6RzhYecbGZ29zuBo1x79ay
+W9wIkjujGNvnTdwZ8lzkKfP33ptTyO59inxIJ+cluE8Cfl+8oqjAa62CNPrDzgkm
+J968mi6ZNXLv9QxMe365wgV63DNLaUxW0RJ1Ma1oJ7THelvl7O0/NNviWUa7PycQ
+AEYrrGjS6UsmHAHuqLM1SjR8TH2DJGyv8t19TjtzFY9Cs2ousD33DEy5MdGSK5Xn
+Zd7WLxs5MvT1rJScjlyJ9WvUZnOq4gIbVBHcp2a1mjvV6NlZ+0nnBeUQ8aNYU/H1
+tFSvXv4K2LCSXua422nRlsmc9pruqYfe9Atapw+fpTRtXSmjI8Wa9ExWAVKtP0U=
+=cCLm
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
index b4de2528749e..6b57eeba6da3 100644
--- a/x11-apps/xinit/files/xserverrc
+++ b/x11-apps/xinit/files/xserverrc
@@ -1,2 +1,6 @@
 #!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..0427d2b6a8a3
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3-r1.ebuild,v 1.1 2014/03/14 12:34:00 ssuominen Exp $
+
+EAPI=5
+
+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 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+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}/${PN}-1.3.3-gentoo-customizations.patch"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir=/etc/X11/xinit
+	)
+	xorg-2_src_configure
+}
+
+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"
+}