From 07f82fa7f7a67448ec3e0a4b4219e51ce97b38c8 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Fri, 21 Apr 2006 22:26:37 +0000 Subject: Missed the actual init script changes last time. Add it now, with a rewritten depend() section by UberLord. (Portage version: 2.1_pre7-r5) --- x11-apps/xinit/ChangeLog | 9 +++++- x11-apps/xinit/files/digest-xinit-1.0.2-r2 | 3 -- x11-apps/xinit/files/digest-xinit-1.0.2-r3 | 3 ++ x11-apps/xinit/files/xdm.start | 26 ++++++++++++++---- x11-apps/xinit/xinit-1.0.2-r2.ebuild | 44 ------------------------------ x11-apps/xinit/xinit-1.0.2-r3.ebuild | 44 ++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 54 deletions(-) delete mode 100644 x11-apps/xinit/files/digest-xinit-1.0.2-r2 create mode 100644 x11-apps/xinit/files/digest-xinit-1.0.2-r3 delete mode 100644 x11-apps/xinit/xinit-1.0.2-r2.ebuild create mode 100644 x11-apps/xinit/xinit-1.0.2-r3.ebuild (limited to 'x11-apps') diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index d5540e781158..baee78ad8d51 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.45 2006/04/20 06:37:42 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.46 2006/04/21 22:26:37 spyderous Exp $ + +*xinit-1.0.2-r3 (21 Apr 2006) + + 21 Apr 2006; Donnie Berkholz ; files/xdm.start, + -xinit-1.0.2-r2.ebuild, +xinit-1.0.2-r3.ebuild: + Missed the actual init script changes last time. Add it now, with a + rewritten depend() section by UberLord. 20 Apr 2006; Donnie Berkholz ; files/xdm.confd: Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r2 b/x11-apps/xinit/files/digest-xinit-1.0.2-r2 deleted file mode 100644 index 29ec40dd3a6d..000000000000 --- a/x11-apps/xinit/files/digest-xinit-1.0.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d591fafe69b57969b0521c461073a01f xinit-1.0.2.tar.bz2 96536 -RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 xinit-1.0.2.tar.bz2 96536 -SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395 xinit-1.0.2.tar.bz2 96536 diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r3 b/x11-apps/xinit/files/digest-xinit-1.0.2-r3 new file mode 100644 index 000000000000..29ec40dd3a6d --- /dev/null +++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r3 @@ -0,0 +1,3 @@ +MD5 d591fafe69b57969b0521c461073a01f xinit-1.0.2.tar.bz2 96536 +RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 xinit-1.0.2.tar.bz2 96536 +SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395 xinit-1.0.2.tar.bz2 96536 diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start index fe4b191d2ea0..09c119ba88d1 100755 --- a/x11-apps/xinit/files/xdm.start +++ b/x11-apps/xinit/files/xdm.start @@ -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.start,v 1.1 2005/09/06 19:33:51 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.2 2006/04/21 22:26:37 spyderous Exp $ # This is here to serve as a note to myself, and future developers. # @@ -39,7 +39,15 @@ # Start X Font Server before X depend() { - use xfs hotplug + need localmount + + # this should start as early as possible + # we can't do 'before *' as that breaks it + after bootmisc + before alsasound net.lo + + # Start before X + use acpid xfs } setup_dm() { @@ -110,10 +118,16 @@ start() { ebegin "Setting up ${SERVICE}" #save the prefered DM save_options "service" "${EXE}" - #tell init to run /etc/X11/startDM.sh after current - #runlevel is finished (should *not* be in the "boot" - # runlevel). - /sbin/telinit a &>/dev/null + + # Start as soon as possible if XSTATICVT is set + if [ "${XSTATICVT}" = "yes" ] ; then + /etc/X11/startDM.sh + else + #tell init to run /etc/X11/startDM.sh after current + #runlevel is finished (should *not* be in the "boot" + # runlevel). + /sbin/telinit a &>/dev/null + fi eend 0 fi diff --git a/x11-apps/xinit/xinit-1.0.2-r2.ebuild b/x11-apps/xinit/xinit-1.0.2-r2.ebuild deleted file mode 100644 index 44b72234a968..000000000000 --- a/x11-apps/xinit/xinit-1.0.2-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2-r2.ebuild,v 1.1 2006/04/20 06:27:09 spyderous Exp $ - -# Must be before x-modular eclass is inherited -# This is enabled due to modified Makefile.am from the patches -SNAPSHOT="yes" - -inherit x-modular pam - -DESCRIPTION="X.Org xinit application" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libX11 - x11-wm/twm - x11-apps/xclock - x11-apps/xrdb - x11-terms/xterm" -DEPEND="${RDEPEND}" -LICENSE="${LICENSE} GPL-2" - -PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch - ${FILESDIR}/gentoo-startx-customization-0.99.4.patch" - -src_unpack() { - x-modular_unpack_source - x-modular_patch_source - - sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am - - x-modular_reconf_source -} - -src_install() { - x-modular_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}/xinitrc - newinitd ${FILESDIR}/xdm.start xdm - newconfd ${FILESDIR}/xdm.confd xdm - newpamd ${FILESDIR}/xserver.pamd xserver -} diff --git a/x11-apps/xinit/xinit-1.0.2-r3.ebuild b/x11-apps/xinit/xinit-1.0.2-r3.ebuild new file mode 100644 index 000000000000..af0206a731c5 --- /dev/null +++ b/x11-apps/xinit/xinit-1.0.2-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2-r3.ebuild,v 1.1 2006/04/21 22:26:37 spyderous Exp $ + +# Must be before x-modular eclass is inherited +# This is enabled due to modified Makefile.am from the patches +SNAPSHOT="yes" + +inherit x-modular pam + +DESCRIPTION="X.Org xinit application" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +RDEPEND="x11-libs/libX11 + x11-wm/twm + x11-apps/xclock + x11-apps/xrdb + x11-terms/xterm" +DEPEND="${RDEPEND}" +LICENSE="${LICENSE} GPL-2" + +PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch + ${FILESDIR}/gentoo-startx-customization-0.99.4.patch" + +src_unpack() { + x-modular_unpack_source + x-modular_patch_source + + sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am + + x-modular_reconf_source +} + +src_install() { + x-modular_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}/xinitrc + newinitd ${FILESDIR}/xdm.start xdm + newconfd ${FILESDIR}/xdm.confd xdm + newpamd ${FILESDIR}/xserver.pamd xserver +} -- cgit v1.2.3-65-gdbad