conditionally revert upstream patch that broke startx on non-systemd systems, bug #526802.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

4 files changed, 129 insertions, 2 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index a7ba75138547..785d492b39d3 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.257 2015/01/03 14:49:32 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.258 2015/02/08 18:26:50 chithanh Exp $
+
+*xinit-1.3.4-r1 (08 Feb 2015)
+
+  08 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xinit-1.3.4-startx-current-vt.patch, +xinit-1.3.4-r1.ebuild:
+  conditionally revert upstream patch that broke startx on non-systemd systems,
+  bug #526802.
 
   03 Jan 2015; Benda Xu <heroxbd@gentoo.org> xinit-1.3.3-r1.ebuild:
   xinitdir handling for Prefix.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b98c0c4dfb90..5e82eaf1ba92 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 SHA512 ef9bc61b9af6723236e543dae1b7c92c739050dd3cb5acc59deaf2589a490323db7e1f52b890dc325e7e7b8db299cd50ad604456c1209ec761da124efd75cdf2 WHIRLPOOL 81de4d5fe95cf145e4ca72291d0bb0984993f165351d7dba78146ff9e2e2555abb4861a867f0962c1148aaac059c3489d52d1aee54c28faf6f0e228ffe38eb2f
 AUX 0001-Gentoo-customizations.patch 1508 SHA256 3b43514ca65c882def485497917c67e64c570fa0c1ef8d758bd949d41e0f9a9c SHA512 a58549e8b94df6d4f1cbde4b65cf6615f1ce7d054c51c0fdd35bbd746dfc8dd57478f437bb4d2c6616cb5d00f24d14658367bda90e82576b5fdbb554e810b6a6 WHIRLPOOL f0c60ea80be664a7ab638b5c20ff7c1d979f5245ec63288633aa7592ae0816ec6de770484e5a47678a15b074be3770ac62bc9efd54f72aeff79de35e77b111b4
 AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb
@@ -5,12 +8,33 @@ 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 xinit-1.3.4-startx-current-vt.patch 808 SHA256 04e21eba179787b66e19c15ba11f7ddf5c7a07caa98b1b7dbbb805df7723e9b9 SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9 WHIRLPOOL 83056b768075c35235e0cac451f037a499577db2ebbe47e021c8869e2aa4c86ed93e96e3617c08b1ed132a5f799bf24cb4c67c9515a52757b6b5680d964091fc
 AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
 AUX xserverrc.1 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c
 DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
 DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222
 EBUILD xinit-1.3.3-r1.ebuild 1824 SHA256 07084419bfcaca8421e082aa4f6e67e08f8d7c9281f7177726cc15a1392c7f13 SHA512 a72c5d28579cc9fb28f6590b67cb324514f87e7716f29fde913ee467a7aaac095d53e97e68e909f20f9d7b5373cf75941b1857d8023ebecb035f65d537f4a29d WHIRLPOOL 20d2cf1448b753b704f19937b0e91c84ffb10f306bdf89d3ac2a12b778b5b7552962fe29c76af9339418e0ba05fd1557ae61e1b4877d42436ba05b04f27ff9dc
 EBUILD xinit-1.3.3.ebuild 1784 SHA256 786de825478f286838c7f77e1359c1e12efdf6861a93fc6015ef8cc4507012e6 SHA512 de3a7423c8ea9d024924bad079d83f33516430cc9c0884904d75b48b985747b33ee7c9ddc59bec2dc97a68634936a14929490c4c830c87564e64aa8f7c058368 WHIRLPOOL 2bedc6740bb7b303b729ac2059eda91ab5242f705c57518e9dadd2cb23f5fba3a6f07e19d07af653e86c88cae9e68b47c7b2440c8309ca88ffba998ffe18f7b4
+EBUILD xinit-1.3.4-r1.ebuild 2028 SHA256 4eb968bd2f7ea7984c2e6238f34ff1073b0dc8696026b9b2272805e9e904fef1 SHA512 e6ea64c4428a47681ffb2cf46c984ae26b78f3b83f663d812fffea0ab175e89eec366a958f800dc49433c7079491b9168830e7013b0e500d28500232b25bb3ab WHIRLPOOL 9b32174d81a289b5959146b613edec7cf7d0f02cf78904182cd61200575c3fbf36a435a8b031acef14e71a3573b3385da6aac16d24d76e3162776cee0fac43df
 EBUILD xinit-1.3.4.ebuild 1821 SHA256 8c8108513b2ced40a1d4725fb1f02d6498e4b15ac238eebfd57b59041f9cf60a SHA512 0e7bbcfa7d2d56ba6604e4f4e0ade861be9f553941563ac7dd05ce4392e12b4d478712793cdbb6e22330c7de9303f025209a9aa9f65f415928b23cba6f25fd8b WHIRLPOOL c1b60159efd21fdc93a126f890ee9d885e6e85f0a1d26703c3b952f69280bf22d25ecc6eaedc2fffdacaa2693cd81d46e8a56ac95468d85417848518ba2781bf
-MISC ChangeLog 38377 SHA256 e8d29d75a85846aee522f35c2905a2a11a8be742ddc7cf1a813398f56cf43c3f SHA512 9e07dcf709625b1ae779094923515e7cae8861083d0bcacb00f4dc1a7d006730065cfb28ff0749cad79a55fd94071642a7ffa7fb55c9c5801423b1459cc4c7ca WHIRLPOOL 96332d61e93409b6743645fceb17ee410da8c0fa6dd6c55ff0c345b9055f71f052f671bc2cded75d32787614999c524756e668d7c7104f9f0a8df2dd6198c6fd
+MISC ChangeLog 38644 SHA256 b0b165770b99a40780fd46221085d3e5a6e48766700958dd9c582c16b938b850 SHA512 b1ae796a6cc420225a8cce69d9b33a8a483a39f9e5a5c96af2652f1d7d3ca25f4974e1e613d337d96c3723ec9f3a685ddff71720f850e2f76cbef6308aff12ba WHIRLPOOL 4913f86116d6f35388dbd62283eed0316d730c2009cb6ca00fd8ca5e3a4b8c34cc215463b551dbf8adf016c50ccb3bfdde47e47b197d5df5be482487503e2184
 MISC metadata.xml 403 SHA256 8b907c5c30247ef4cb17fcf9dbaead16f3e6fd3b112d331b686cd6accd410f08 SHA512 6d64681045ad9dfe42c54d9e625a7b2f120eadd223d753ac79483aef5f03b819104168b9b5124244ce825bbe2a69ca32b1bc8176b85d42694a7b0f94f840c915 WHIRLPOOL e6ece8bf3d45c1697a8ca62a34360f5966bb07d2f938a606fefbcf474c4ba9a94356f824f1b6bf8dd7be0c7be169eee163de8dc1b9f000822ea808b6d8d567e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU16p6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRn+AP/RWJlCF6hMhSWrt1XncBen1L
+/9ZkTbeTKLfNKvKCYi2YtSEm6JNTDe8i3xmKMqJSIy2wxhIr+yOERM0lwos9tzUm
+ZFk6wuTvRJ3Nqe1tQraTUjKjkloaj3fq7AXGzCVJBbOsis5R1FHzFz1OQpSDdSed
+J825VBPE5a+N4ZMn2yZZ3fE/9LabhRnxhwpKhib+VaOynAs/HVa5v3wHiJsPrUq3
+H5XVhzgTHUq76BiBnD7YGCpcZ84u7ydDYHTrZIwarSkvCEPzRblpjgsz5blfRrZy
+0g9IUToAGno76K21HE+tWsNqyDM44907K34niAdkS/28tuJZGiLWUPqeE64FU6Iz
+GjZ3cViqk1at+rxJcwt6ok1f3K1tceJ/OQVEFp6fMmipSFLibNVEamv4Oxfz84Ty
+HPi4kIwFuzWDQOuzHv1rUPF2BxkOw/X41uECcZ6TbhVa4PCWt6KpwjqXF6mARoXJ
+BqRlx7yGbQl9E2zKRXqjvw+B8lr+S7ypgCndzkY7yS7vvpAE8yG7RITZQmWXkZI6
+m7B7uWLVj8pTCm5tGSTdj6UtSPGDdeiyK0lnyiYonbEEcPaZoj/JEfN818poxuNB
+FhbId1fIHrslZMoiIK3o5gqBghgs5/mmD99yVv/jPo+mylQ5CPGD7k9D8BE8YQbW
+JMXkA8T7L2hBTVJQpO0N
+=PiYS
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
new file mode 100644
index 000000000000..362b420cfc8f
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
@@ -0,0 +1,21 @@
+diff -ur a/startx.cpp b/startx.cpp
+--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
++++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
+@@ -188,17 +188,6 @@
+ if [ x"$server" = x ]; then
+     server=$defaultserver
+ 
+-#ifdef __linux__
+-    XCOMM When starting the defaultserver start X on the current tty to avoid
+-    XCOMM the startx session being seen as inactive:
+-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+-    tty=$(tty)
+-    if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+-        vtarg="vt$tty_num"
+-    fi
+-#endif
+-
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+     if [ x"$serverargs" = x -a x"$display" = x ]; then
+ 	if [ -f "$userserverrc" ]; then
diff --git a/x11-apps/xinit/xinit-1.3.4-r1.ebuild b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..5d0f1e904772
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild,v 1.1 2015/02/08 18:26:50 chithanh 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 systemd"
+
+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_prepare() {
+	# this patch breaks startx on non-systemd systems, bug #526802
+	if use !systemd; then
+		PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch )
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir="${EPREFIX}"/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
+	newexe "${FILESDIR}"/xserverrc.1 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"
+}