summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-01-22 15:30:07 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-01-22 15:30:07 +0000
commit891c0119b7dac57b1f3da62af375495cc302648b (patch)
tree0bd025c1011c1d8274081d695bc82835ee1c268a /x11-base
parentRemove old versions. (diff)
downloadhistorical-891c0119b7dac57b1f3da62af375495cc302648b.tar.gz
historical-891c0119b7dac57b1f3da62af375495cc302648b.tar.bz2
historical-891c0119b7dac57b1f3da62af375495cc302648b.zip
add lxdm support, see bug #330355
Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog5
-rw-r--r--x11-base/xorg-server/Manifest4
-rw-r--r--x11-base/xorg-server/files/xdm.initd-310
3 files changed, 14 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 49f3deb9ec07..d8f8a8ff9791 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.558 2011/01/19 21:38:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.559 2011/01/22 15:30:07 lxnay Exp $
+
+ 22 Jan 2011; Fabio Erculiani <lxnay@gentoo.org> files/xdm.initd-3:
+ add lxdm support, see bug #330355
19 Jan 2011; Rémi Cardona <remi@gentoo.org> xorg-server-1.9.3.901.ebuild:
Remove useless eautoreconf (bug #351830)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4072aeb7f93f..9200300a0e7c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,7 +5,7 @@ AUX 1.9.0-fix-VbeModeInfoBlock-memcpy.patch 1356 RMD160 5f7a07dd12df519663f12ff4
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
-AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
+AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd30222c7941d50fc0f62c5008a0e3b97e2d00e0 SHA256 8f1d35638559d12ed14e8cc2e26800e0ee9a10f14c7be912c834c73d12913601
AUX xorg-server-1.7.6-tslib-as-needed.patch 942 RMD160 d78cde49e7725890be41eca4cb3234e487625ad3 SHA1 41c634c00dd18783a39e2e3bc2aa6342e364e1e1 SHA256 881f23f2f43f6124de202d4fd54a1ef7f505fef3965371cc6145faffa84c5547
AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
@@ -25,5 +25,5 @@ EBUILD xorg-server-1.8.2.ebuild 8257 RMD160 885186326c9416f17e56e41ca448b55dd1b2
EBUILD xorg-server-1.9.2.902.ebuild 7901 RMD160 184050c0d419ef6fe310c87f0811548e59abd38d SHA1 c3ece5a50ae39feba92f8caf16d393d3b2cf2f7d SHA256 b9bfb2c3e353f2aade82177115ff84fff498db4e3368245aa7e9412b0484d90f
EBUILD xorg-server-1.9.2.ebuild 8168 RMD160 13945024352149dfe10696fa36d9a46dab4f01fe SHA1 f585818520ff1ff5fd169d314672696196e092cb SHA256 92cd5d3d832ac05197dcb1717c7e92f29837e14ba31010472e7513e1c829693b
EBUILD xorg-server-1.9.3.901.ebuild 7788 RMD160 5f03ddc1acc27e0a4e5b60c2023bea57b7f0ff59 SHA1 f35ed877d93ff6c65bd5fe748421be0b6cd60f6a SHA256 12d76e4966ba02046271e0fa4fbfb49dd1c778f694b55ea69e3c046d472a2a5e
-MISC ChangeLog 122251 RMD160 f8fe39fb78701a60a1b3c2fa3ff44e09aff9c450 SHA1 8a84ca08aab83041629a1f3e05f4a1cce7a0016f SHA256 ea2a7468136cc68c6a01d14298d637c2a9288226bb45e5a16550c2cb9d48fe07
+MISC ChangeLog 122358 RMD160 e02843eb6d3411ca8dbc10dd7b4005a0c28210bc SHA1 5da8048811022abae08044def0d2a7b769dd4acf SHA256 3dc4a89e69a9e5748f39701319de9803be104c8bd3de3e36ec0d362d17b481f2
MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-3
index ae5f59e45015..993af2f2ede5 100644
--- a/x11-base/xorg-server/files/xdm.initd-3
+++ b/x11-base/xorg-server/files/xdm.initd-3
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.1 2010/09/28 12:43:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.2 2011/01/22 15:30:07 lxnay Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -90,6 +90,11 @@ setup_dm() {
EXE=/usr/bin/gpe-dm
PIDFILE=/var/run/gpe-dm.pid
;;
+ lxdm)
+ EXE=/usr/sbin/lxdm-binary
+ PIDFILE=/var/run/lxdm.pid
+ START_STOP_ARGS="--background"
+ ;;
*)
# first find out if there is such executable
EXE="$(which ${MY_XDM} 2>/dev/null)"
@@ -141,6 +146,7 @@ start() {
save_options "service" "${EXE}"
save_options "name" "${NAME}"
save_options "pidfile" "${PIDFILE}"
+ save_options "start_stop_args" "${START_STOP_ARGS}"
if [ -n "${CHECKVT-y}" ] ; then
if vtstatic "${CHECKVT:-7}" ; then