Changed pam install to use newpamd from pam.eclass. Also updated pam script

to use new include syntax.  Hopefully this will fix pam issues for everyone
who had them, especially BSD.
Package-Manager: portage-2.0.51.22-r2

6 files changed, 21 insertions, 41 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index a89fe804cd8e..4b1d579a745c 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.8 2005/09/04 08:32:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.9 2005/09/04 18:17:23 joshuabaergen Exp $
+
+*xdm-0.99.0-r2 (04 Sep 2005)
+
+  04 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xdm.pamd,
+  -xdm-0.99.0.ebuild, -xdm-0.99.0-r1.ebuild, +xdm-0.99.0-r2.ebuild:
+  Changed pam install to use newpamd from pam.eclass.  Also updated pam script
+  to use new include syntax.  Hopefully this will fix pam issues for everyone
+  who had them, especially BSD.
 
   04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xdm-0.99.0-r1.ebuild:
   Added ~sh
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 8737f62bcd55..5c47cd4ecae6 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,8 +1,6 @@
-MD5 8efe82f13f2324502e51d1c6b911f34c xdm-0.99.0-r1.ebuild 883
-MD5 aa72d16d8c77230b00bf5117574b6ca4 xdm-0.99.0.ebuild 688
-MD5 b58d3854d829c228f2827b6a00320755 ChangeLog 1288
-MD5 d73361c3f6f0e02b6250ec10fc75339b files/digest-xdm-0.99.0-r1 63
+MD5 5355f394df825a7025bf54824ca74dd1 ChangeLog 1656
+MD5 3697f66bdc1dcb15452af130e67c021d xdm-0.99.0-r2.ebuild 875
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
-MD5 d138f3f50b73fd1c0670ac927a5bc295 files/xdm.pamd 257
-MD5 d73361c3f6f0e02b6250ec10fc75339b files/digest-xdm-0.99.0 63
+MD5 d73361c3f6f0e02b6250ec10fc75339b files/digest-xdm-0.99.0-r2 63
+MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
 MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
diff --git a/x11-apps/xdm/files/digest-xdm-0.99.0-r2 b/x11-apps/xdm/files/digest-xdm-0.99.0-r2
new file mode 100644
index 000000000000..dd77dcd3bbcb
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-0.99.0-r2
@@ -0,0 +1 @@
+MD5 6946ed1753f8a0f5ddc8a94174f0f8ef xdm-0.99.0.tar.bz2 169521
diff --git a/x11-apps/xdm/files/xdm.pamd b/x11-apps/xdm/files/xdm.pamd
index 339f4162bb38..5d2b2b56b068 100644
--- a/x11-apps/xdm/files/xdm.pamd
+++ b/x11-apps/xdm/files/xdm.pamd
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 auth       required	pam_nologin.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/x11-apps/xdm/xdm-0.99.0-r1.ebuild b/x11-apps/xdm/xdm-0.99.0-r2.ebuild
index 2c380c1a4489..3ce222a56d33 100644
--- a/x11-apps/xdm/xdm-0.99.0-r1.ebuild
+++ b/x11-apps/xdm/xdm-0.99.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.0-r1.ebuild,v 1.5 2005/09/04 08:32:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.0-r2.ebuild,v 1.1 2005/09/04 18:17:23 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
 
-inherit x-modular
+inherit x-modular pam
 
 DESCRIPTION="X.Org xdm application"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
@@ -30,6 +30,5 @@ src_install() {
 	exeinto /etc/X11/xdm
 	doexe ${FILESDIR}/Xsession
 	newinitd ${FILESDIR}/xdm.start xdm
-	insinto /etc/pam.d
-	newins ${FILESDIR}/xdm.pamd xdm
+	newpamd ${FILESDIR}/xdm.pamd xdm
 }
diff --git a/x11-apps/xdm/xdm-0.99.0.ebuild b/x11-apps/xdm/xdm-0.99.0.ebuild
deleted file mode 100644
index 7e8ebda8960b..000000000000
--- a/x11-apps/xdm/xdm-0.99.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.0.ebuild,v 1.4 2005/08/24 00:57:23 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xdm application"
-KEYWORDS="~arm ~ppc ~s390 ~sparc ~x86"
-IUSE="xprint ipv6 pam"
-RDEPEND="x11-libs/libXdmcp
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)
-	$(use_enable ipv6)
-	$(use_with pam)"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}