diff options
| author |   Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2011-08-01 23:05:48 +0200 |
|---|---|---|
| committer | Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2011-08-01 23:05:48 +0200 |
| commit | 4f0297b390e48f4a327f51bd32ff8ca5d78ae9fc (patch) | |
| tree | d79a02775a362889277bf65045d59ac3ef035373 /x11-apps/xinit | |
| parent | media-libs/mesa: move libxml2 from RDEPEND to DEPEND (diff) | |
| download | x11-4f0297b390e48f4a327f51bd32ff8ca5d78ae9fc.tar.gz x11-4f0297b390e48f4a327f51bd32ff8ca5d78ae9fc.tar.bz2 x11-4f0297b390e48f4a327f51bd32ff8ca5d78ae9fc.zip | |
x11-apps/xinit: sync with portage
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 12 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/startDM.sh | 7 |
2 files changed, 5 insertions, 14 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index cb1de1c0..ee0b5b77 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,18 +1,8 @@ ------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 chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212 -AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 +AUX startDM.sh 923 RMD160 b457ea1bf2cb059a4faf5c98811589412c5026fc SHA1 b462b58ac0d76f0f5b1c8e3562da75d99488b7da SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499 AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 EBUILD xinit-9999.ebuild 1583 RMD160 053fe8f27a814f571bdd3fca569c458140c6e54a SHA1 ec3d755e9d2a90d683471c192f1d7c7bf17d41bb SHA256 e6a93537bb3f3e7fa980ec870958985e5d1edba13cb20781c19b3ebbb1e1f39c MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk2oiqkACgkQnGSe5QXeB7u9cwCfQwA9A8//MsYVWiriUWBsnGyc -gzYAoLWhOiwtaVICTNaAvu3kVgbLv6zI -=99yt ------END PGP SIGNATURE----- diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh index 9775b07f..ebb79704 100755 --- a/x11-apps/xinit/files/startDM.sh +++ b/x11-apps/xinit/files/startDM.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $ # We need to source /etc/profile for stuff like $LANG to work # bug #10190. @@ -22,9 +22,10 @@ export SVCNAME=xdm EXEC="$(get_options service)" NAME="$(get_options name)" PIDFILE="$(get_options pidfile)" +START_STOP_ARGS="$(get_options start_stop_args)" start-stop-daemon --start --exec ${EXEC} \ -${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \ +${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \ eerror "ERROR: could not start the Display Manager" # vim:ts=4 |