diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-11-05 07:13:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-11-05 07:13:48 +0000 |
| commit | 01ee2adf2d39919925c66c7b5641bb5b62d881be (patch) | |
| tree | 517e92311da06b296b5ea8883b8b25c8de7939b4 /x11-apps/xinit | |
| parent | Version bump to 1.0.2 (diff) | |
| download | gentoo-2-01ee2adf2d39919925c66c7b5641bb5b62d881be.tar.gz gentoo-2-01ee2adf2d39919925c66c7b5641bb5b62d881be.tar.bz2 gentoo-2-01ee2adf2d39919925c66c7b5641bb5b62d881be.zip | |
Add pam to IUSE so the xserver pam.d file is conditionally installed.
(Portage version: 2.1.3.16)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.5-r1.ebuild | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 38c18f7e9854..351b32530008 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.102 2007/10/09 08:43:43 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.103 2007/11/05 07:13:48 vapier Exp $ + + 05 Nov 2007; Mike Frysinger <vapier@gentoo.org> xinit-1.0.5-r1.ebuild: + Add pam to IUSE so the xserver pam.d file is conditionally installed. 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; -files/gentoo-startx-customization-0.99.4.patch, diff --git a/x11-apps/xinit/xinit-1.0.5-r1.ebuild b/x11-apps/xinit/xinit-1.0.5-r1.ebuild index 5d5b1df00e8b..d7a1678fcc2a 100644 --- a/x11-apps/xinit/xinit-1.0.5-r1.ebuild +++ b/x11-apps/xinit/xinit-1.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.2 2007/09/11 08:36:30 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.3 2007/11/05 07:13:48 vapier Exp $ # Must be before x-modular eclass is inherited # This is enabled due to modified Makefile.am from the patches @@ -12,7 +12,7 @@ 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="hal minimal" +IUSE="hal minimal pam" RDEPEND="x11-apps/xauth x11-libs/libX11 @@ -51,12 +51,12 @@ src_unpack() { src_install() { x-modular_src_install exeinto /etc/X11 - doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh + doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die exeinto /etc/X11/Sessions - doexe ${FILESDIR}/Xsession + doexe "${FILESDIR}"/Xsession || die exeinto /etc/X11/xinit - doexe ${FILESDIR}/xinitrc - newinitd ${FILESDIR}/xdm.initd-1 xdm - newconfd ${FILESDIR}/xdm.confd-1 xdm - newpamd ${FILESDIR}/xserver.pamd xserver + doexe "${FILESDIR}"/xinitrc || die + newinitd "${FILESDIR}"/xdm.initd-1 xdm + newconfd "${FILESDIR}"/xdm.confd-1 xdm + newpamd "${FILESDIR}"/xserver.pamd xserver } |