Add the dependency on PAM to all versions wrt bug #351856. Install the pam.d file only when pam flag is enabled (only in the newest one).

Package-Manager: portage-2.2.0_alpha15_p1/cvs/Linux x86_64

5 files changed, 29 insertions, 19 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 818d116fcfb3..2cba71d35209 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.107 2010/12/17 22:25:13 mgorny Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.108 2011/01/16 22:38:18 mgorny Exp $
+
+  16 Jan 2011; Michał Górny <mgorny@gentoo.org> xdm-1.1.8.ebuild,
+  xdm-1.1.9.ebuild, xdm-1.1.10.ebuild:
+  Add the dependency on PAM to all versions wrt bug #351856. Install the pam.d
+  file only when pam flag is enabled (only in the newest one).
 
 *xdm-1.1.10 (17 Dec 2010)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index a0904de07d55..8faecf158281 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -8,15 +8,15 @@ AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1
 DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee SHA1 45eb013aa14ddd8d385b200b94fb0fbcbe09b860 SHA256 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
 DIST xdm-1.1.8.tar.bz2 401712 RMD160 5435ff73a8fea36ecb071462121308f828d47927 SHA1 619d810d9cd60e193be72365791cdb4057fc56ce SHA256 e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
 DIST xdm-1.1.9.tar.bz2 425348 RMD160 4a80e19ad1af6d3c61f3e10c3d2719c4811418d9 SHA1 ea0ee2923999d54848dc8a165867ffa7c628fd7b SHA256 e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134
-EBUILD xdm-1.1.10.ebuild 1110 RMD160 f81ff7fc61ddb4a7d98c076379033728c7605cdb SHA1 00a2a384acb4b04f873a0712aee2f49ba61cb01a SHA256 6c9c9099f9b77cea3f7927c98af43d356fd38b5090a0ee3dcd68d1f96069e1b9
-EBUILD xdm-1.1.8.ebuild 1285 RMD160 fb527ab85cfbff1dfc12999c80939b930168f25a SHA1 fead84bfd42f460e6512e0af0c555b8fef69dfaa SHA256 5fa8d15602da77c0b595094e1fd8af68190d884599affa91259778e0469dee62
-EBUILD xdm-1.1.9.ebuild 1362 RMD160 0c4dc7d88d4c74f592b3926fd20c5a339fea4197 SHA1 d98b6b45034a584395acb23969c7a8341fc764b3 SHA256 4ee044ffa55d15ae124b02d4b633bff0af1885546818ea7e6a80200473c40d08
-MISC ChangeLog 15638 RMD160 3365d0d767c89aeae3544be4c6d076cd4caeace8 SHA1 c71650bf5d13b27a6e4c13960f8239d7cab45a73 SHA256 71177fe5cd04a4eecd530d00d6aaf7114890529008332f4dbbd5a1e8e7e5e369
+EBUILD xdm-1.1.10.ebuild 1155 RMD160 0b5543cef167957ff41a5d410ddb5e5a02e49b44 SHA1 20d98479524056c9688a263eae951c3a6e8a89fd SHA256 b1d53cf922e0d6ba3e9da0eb10a9ead7e2764844ecfbe67edb5505b0e82bbc18
+EBUILD xdm-1.1.8.ebuild 1309 RMD160 3b4504a0d415fb11b2d909baecdb48f7996930db SHA1 94a48039a4e0c19fc45ef8fd7965ce01860cbcac SHA256 48e6fd580984ddae35c016eddc9b904ddbc46e376fdfc7896dace9ef901f4080
+EBUILD xdm-1.1.9.ebuild 1383 RMD160 57fbdd01f84d1b246155cad747f885c367d42430 SHA1 44c108d6a8323c284b8b0a86cffbffe654abc57a SHA256 d851c130f5b1cdbce005e3bf9e4ce003d684d99290ef5ecc8cac1cf256ad52fd
+MISC ChangeLog 15888 RMD160 c9fd66f12b655c385b26da004962544a745460c4 SHA1 ed0e50e0bf0ecbd187bd07d1bdeb26e6d64bab8f SHA256 02f01f1fe1b9ed31e7d93565f50ec7ca878ff9c505b90547230f1612b8f26a9f
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0L4rAACgkQnGSe5QXeB7t8jwCgm8edzkHVtG6fk36oskW3WNDK
-E9wAn1P9all4Zdc/WmQs9/XGnNaUn1Ef
-=9rdO
+iEYEARECAAYFAk0zc2EACgkQnGSe5QXeB7vgOACfUJKzvRf4c6C+UK3QrLu6a+jJ
+1akAnRf7eJh9olklanIEticGTU3gO1yV
+=FYeh
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/xdm-1.1.10.ebuild b/x11-apps/xdm/xdm-1.1.10.ebuild
index 034a0dc493b8..02f580d16f36 100644
--- a/x11-apps/xdm/xdm-1.1.10.ebuild
+++ b/x11-apps/xdm/xdm-1.1.10.ebuild
@@ -1,6 +1,6 @@
-# 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-apps/xdm/xdm-1.1.10.ebuild,v 1.1 2010/12/17 22:25:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10.ebuild,v 1.2 2011/01/16 22:38:18 mgorny Exp $
 
 EAPI=3
 
@@ -22,7 +22,8 @@ RDEPEND="x11-apps/xrdb
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-apps/sessreg
-	x11-apps/xconsole"
+	x11-apps/xconsole
+	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	x11-proto/xproto"
@@ -40,7 +41,9 @@ src_install() {
 	xorg-2_src_install
 	exeinto /usr/$(get_libdir)/X11/xdm
 	doexe "${FILESDIR}"/Xsession || die
-	newpamd "${FILESDIR}"/xdm.pamd xdm || die
+	if use pam; then
+		newpamd "${FILESDIR}"/xdm.pamd xdm || die
+	fi
 	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
 	keepdir /var/lib/xdm
 }
diff --git a/x11-apps/xdm/xdm-1.1.8.ebuild b/x11-apps/xdm/xdm-1.1.8.ebuild
index df65ea324446..958dc75e053e 100644
--- a/x11-apps/xdm/xdm-1.1.8.ebuild
+++ b/x11-apps/xdm/xdm-1.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.8.ebuild,v 1.11 2009/06/22 07:13:25 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.8.ebuild,v 1.12 2011/01/16 22:38:18 mgorny Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -22,7 +22,8 @@ RDEPEND="x11-apps/xrdb
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-apps/sessreg
-	x11-apps/xconsole"
+	x11-apps/xconsole
+	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	x11-proto/xproto"
diff --git a/x11-apps/xdm/xdm-1.1.9.ebuild b/x11-apps/xdm/xdm-1.1.9.ebuild
index ce98c6eb84d3..b8292e2c46b9 100644
--- a/x11-apps/xdm/xdm-1.1.9.ebuild
+++ b/x11-apps/xdm/xdm-1.1.9.ebuild
@@ -1,6 +1,6 @@
-# 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-apps/xdm/xdm-1.1.9.ebuild,v 1.8 2010/02/21 16:48:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.9.ebuild,v 1.9 2011/01/16 22:38:18 mgorny Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -22,7 +22,8 @@ RDEPEND="x11-apps/xrdb
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-apps/sessreg
-	x11-apps/xconsole"
+	x11-apps/xconsole
+	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	x11-proto/xproto"