diff options
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.8-r8.ebuild | 78 |
2 files changed, 86 insertions, 1 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 8676c536930f..a81f56c6900c 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # 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.138 2009/09/21 07:53:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.139 2009/09/21 08:00:33 scarabeus Exp $ + +*xinit-1.0.8-r8 (21 Sep 2009) + + 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xinit-1.0.8-r8.ebuild: + Revbump the xinint for the last commit so automagicness is fixed even for + those whom already compiled the thing. 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> xinit-1.0.8-r7.ebuild: diff --git a/x11-apps/xinit/xinit-1.0.8-r8.ebuild b/x11-apps/xinit/xinit-1.0.8-r8.ebuild new file mode 100644 index 000000000000..88bcbbf0ace3 --- /dev/null +++ b/x11-apps/xinit/xinit-1.0.8-r8.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r8.ebuild,v 1.1 2009/09/21 08:00:33 scarabeus Exp $ + +EAPI="2" + +# 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 Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="consolekit hal minimal pam" + +RDEPEND=" + x11-apps/xauth + x11-libs/libX11 + hal? ( sys-apps/hal sys-apps/dbus[X] ) + consolekit? ( + sys-auth/consolekit + hal? ( sys-apps/hal[consolekit] ) + ) +" +DEPEND="${RDEPEND}" +PDEPEND="!minimal? ( + x11-apps/xclock + x11-apps/xrdb + x11-apps/xsm + x11-terms/xterm + x11-wm/twm + ) +" + +PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch + "${FILESDIR}"/gentoo-startx-customization-1.0.8.patch + "${FILESDIR}"/xinit-1.0.4-console-kit.patch ) + +pkg_setup() { + CONFIGURE_OPTIONS="$(use_with consolekit)" +} + +src_prepare() { + 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 || die + exeinto /etc/X11/Sessions + doexe "${FILESDIR}"/Xsession || die + exeinto /etc/X11/xinit + doexe "${FILESDIR}"/xinitrc || die + newinitd "${FILESDIR}"/xdm.initd-3 xdm + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newconfd "${FILESDIR}"/xdm.confd-1 xdm + newpamd "${FILESDIR}"/xserver.pamd xserver +} + +pkg_postinst() { + x-modular_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" +} |