diff options
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/Manifest | 4 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm.initd-4 | 21 |
3 files changed, 17 insertions, 13 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 9909cd0e54a0..3cf876f6b295 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.172 2009/12/15 19:15:13 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.173 2009/12/21 11:29:45 scarabeus Exp $ + + 21 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xdm.initd-4: + Update bit xdm handling with various non-default xdm values. 15 Dec 2009; Brent Baude <ranger@gentoo.org> xinit-1.2.0-r3.ebuild: Marking xinit-1.2.0-r3 ppc64 stable for bug 294958 diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index b9633106549c..819440577e9b 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -9,7 +9,7 @@ AUX xdm-setup.initd-1 340 RMD160 65c5ee210735aaaa49033ae29f91ae658b8cd512 SHA1 1 AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3 AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a80b17a41ed4812aedf7fd1082df7e9f1335 SHA256 44042c13cbc759e2580a32f8a30b58eb2eb71c1d5f4b4cd94e9de476667862bb AUX xdm.initd-3 5311 RMD160 59ebf694c267db8671db277cdae7c1fb79067faa SHA1 16ca6179d71f7e90de0cf7935c46caf50dac2268 SHA256 74d01b9f7f7c4aa0e0521e2043a9c484ee66ff0e7a5f923d01a786db386f36cc -AUX xdm.initd-4 6417 RMD160 642aef20aa2ce73e3a6cbfa078610e80a4d16e56 SHA1 2d52fd90f35664f2f3f8bedef05ce652027a524f SHA256 a2ca8bcf962c6392c93ada0d566ac2f3dbf9c167d914dfd21e0691e01d473a8f +AUX xdm.initd-4 6515 RMD160 3fcde7817879552b9cee0f09063116db8b8183a7 SHA1 fc4f56fdeccdec537f52fbc34c1ba89591c5b8de SHA256 1df57f1d7249d227025cd1444f857be3a78898dad06f5f0fe6be17bf2c0e1fa2 AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 @@ -18,5 +18,5 @@ DIST xinit-1.0.8.tar.bz2 117049 RMD160 d01b299e6e96c2b5318aaec479c81670b94e2129 DIST xinit-1.2.0.tar.bz2 136781 RMD160 c2895db985482c13ef300a037bf2e182aeda1442 SHA1 85a838c2010f27ef6d09d6ec4b1208a66cc8d697 SHA256 ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f EBUILD xinit-1.0.8-r10.ebuild 2331 RMD160 35a7638e440f3f7ebbd9e41d67903e294749c3f2 SHA1 3639d3b4568131f8c97291ad9fd81f36bc6640c8 SHA256 f61e0d08fa32a23d6d583f56e87e5c7fc2d7154258a79bc684a94e3565a4a7fe EBUILD xinit-1.2.0-r3.ebuild 1896 RMD160 0a101a72e6c0d06a590d3c1f0370ecc0ea1ed8cb SHA1 7c82f17c70eef1f981635cf9da3e16d236157650 SHA256 0ff21e4431db2a67dc67933b75e1089303fbdb2531a83651d8e3aae1858dd5fd -MISC ChangeLog 27341 RMD160 6bb8d19897a96aba85b909002abc910d507dcd18 SHA1 630623ddfb5af7e17343d94f2db7a3eb92e6eb89 SHA256 d100d45ab756654074ccfd55f6ff075fba6c5567dd06123387ecbc58ca3d373d +MISC ChangeLog 27482 RMD160 3c8f3dabe809c2cae460619b9714d34a291159d6 SHA1 6d3cc00fcccbd461d5b41d0d8263c06431d806cb SHA256 affdf63578e198e40e6931b6f77f8c25a2318adf3d9eb0ab800842ee9fdaec2a MISC metadata.xml 423 RMD160 c876450af2ac21f578380b4451185eb319d80d0e SHA1 44d53f0b7ffba06392eea95e72e3e000ebf45ad8 SHA256 fc28c674a857c63b7effbe9c7f186b56ec30cd7b5dabf814545d605cf4ab7817 diff --git a/x11-apps/xinit/files/xdm.initd-4 b/x11-apps/xinit/files/xdm.initd-4 index 5e4afca770f9..d4f6082eb106 100644 --- a/x11-apps/xinit/files/xdm.initd-4 +++ b/x11-apps/xinit/files/xdm.initd-4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-4,v 1.1 2009/11/14 14:18:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-4,v 1.2 2009/12/21 11:29:45 scarabeus Exp $ # This is here to serve as a note to myself, and future developers. # @@ -132,21 +132,22 @@ setup_dm() { PIDFILE=/var/run/gpe-dm.pid ;; *) - EXE= - # Fix #65586, where MY_XDM is empty so EXE=somedir - [ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \ - && EXE="/usr/bin/${MY_XDM}" - if [ -z "${EXE}" ] ; then - EXE=/usr/bin/xdm - PIDFILE=/var/run/xdm.pid + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ "${EXE}" = "" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." fi ;; esac - if ! [ -x "${EXE}" ] ; then + if ! [ -x "${EXE}" ]; then EXE=/usr/bin/xdm PIDFILE=/var/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ] ; then + if ! [ -x "/usr/bin/xdm" ]; then echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," echo " or install x11-apps/xdm package" eend 255 |