Add pam to IUSE so the xserver pam.d file is conditionally installed.

Package-Manager: portage-2.1.3.16

3 files changed, 23 insertions, 20 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/Manifest b/x11-apps/xinit/Manifest
index ee15ba5e7139..e453a1d9ca42 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -51,14 +51,14 @@ EBUILD xinit-1.0.4.ebuild 1329 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 S
 MD5 b16a86030844afb016be3629bc5414d9 xinit-1.0.4.ebuild 1329
 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 xinit-1.0.4.ebuild 1329
 SHA256 660abed7cdf4a5e8cc8d5b7ce696e4c5c4252ac23417f6acb323edbe157612c9 xinit-1.0.4.ebuild 1329
-EBUILD xinit-1.0.5-r1.ebuild 1701 RMD160 881c2cec0d38b038ecbe20239e04b1e81625a2f1 SHA1 4ee6dcd32421604c0e56a379abbea83bf9446faa SHA256 ea2993b89345907af2c03ab203eda721a8c1784d724f9e02a15f1d01768b8b61
-MD5 e44204d3be44873a2a5bb29e0cbec414 xinit-1.0.5-r1.ebuild 1701
-RMD160 881c2cec0d38b038ecbe20239e04b1e81625a2f1 xinit-1.0.5-r1.ebuild 1701
-SHA256 ea2993b89345907af2c03ab203eda721a8c1784d724f9e02a15f1d01768b8b61 xinit-1.0.5-r1.ebuild 1701
-MISC ChangeLog 16370 RMD160 66f141285326aacc4745cda50a67934ee529c733 SHA1 982ab77ad293be75f979eac6bbe15954bfef2173 SHA256 1eb1e92e219a5b4c797b26ca1e7c27ff39ca553dc0215e4b90a57a3902d15895
-MD5 407a66a170ca9ed1edf15ca3fedd0e58 ChangeLog 16370
-RMD160 66f141285326aacc4745cda50a67934ee529c733 ChangeLog 16370
-SHA256 1eb1e92e219a5b4c797b26ca1e7c27ff39ca553dc0215e4b90a57a3902d15895 ChangeLog 16370
+EBUILD xinit-1.0.5-r1.ebuild 1737 RMD160 512a4e585dceebd1246304bd3c9a6345dc34a3ad SHA1 b0ad6eb6b43f116cede19bc8d5331c5e7cf5c338 SHA256 888cfdc548be2c1fdf299295f12627f9d5ab24d35b96b7d3324fc89b866fb713
+MD5 102521b74e5c1a42e2b71b4513074f7c xinit-1.0.5-r1.ebuild 1737
+RMD160 512a4e585dceebd1246304bd3c9a6345dc34a3ad xinit-1.0.5-r1.ebuild 1737
+SHA256 888cfdc548be2c1fdf299295f12627f9d5ab24d35b96b7d3324fc89b866fb713 xinit-1.0.5-r1.ebuild 1737
+MISC ChangeLog 16513 RMD160 68ea5441c589c297a042d6aa28bfb4408de14881 SHA1 ee3283879db3f602d6b72107509dd43f925b6cb2 SHA256 3feeed486aa95a481a105d400eee6d5be876629a9935ed058d36364be9290884
+MD5 69d02c9fc86f7891cce3e2f6d95e15f6 ChangeLog 16513
+RMD160 68ea5441c589c297a042d6aa28bfb4408de14881 ChangeLog 16513
+SHA256 3feeed486aa95a481a105d400eee6d5be876629a9935ed058d36364be9290884 ChangeLog 16513
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -72,7 +72,7 @@ SHA256 29a4fe681a6f9fc87e3ee93fa3827d85ad73aaeefa916b08a6ec90f16ec42606 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCz9EXVaO67S1rtsRApJ1AJ9W1yH1fUp4MBXs5I52ZS2f6fPeBQCeJQ/Q
-gdV2gv5YqvaJ6bdr/P+u/GA=
-=mNWE
+iD8DBQFHLsKyp/wUKkr7RBoRAo1BAKDFdSyfD9BSAJApwsciKm5qSSEkZwCgitVC
+nUoTY0SMNO3xDshkff6phZA=
+=8Z0X
 -----END PGP SIGNATURE-----
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
 }