Reduce the pamd installation code, remove two directories too.

(Portage version: 2.1.3_rc7)

10 files changed, 25 insertions, 27 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index aa1f0c283252..8bf719c999f3 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.159 2007/07/10 13:05:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.160 2007/07/10 13:49:07 flameeyes Exp $
+
+  10 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/pam.d-0.99/other, -files/pam.d-0.99/system-auth, +files/other.pamd,
+  -files/pam.d/other, -files/pam.d/system-auth,
+  +files/system-auth.pamd.0.78, +files/system-auth.pamd.0.99,
+  pam-0.78-r3.ebuild, pam-0.78-r5.ebuild, pam-0.99.7.1.ebuild,
+  pam-0.99.8.0.ebuild, pam-0.99.8.0-r1.ebuild:
+  Reduce the pamd installation code, remove two directories too.
 
 *pam-0.99.8.0-r1 (10 Jul 2007)
 
diff --git a/sys-libs/pam/files/pam.d-0.99/other b/sys-libs/pam/files/other.pamd
index 85ca04ecf3ce..85ca04ecf3ce 100644
--- a/sys-libs/pam/files/pam.d-0.99/other
+++ b/sys-libs/pam/files/other.pamd
diff --git a/sys-libs/pam/files/pam.d/other b/sys-libs/pam/files/pam.d/other
deleted file mode 100644
index 85ca04ecf3ce..000000000000
--- a/sys-libs/pam/files/pam.d/other
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_deny.so
-account    required	pam_deny.so
-password   required	pam_deny.so
-session    required	pam_deny.so
diff --git a/sys-libs/pam/files/pam.d/system-auth b/sys-libs/pam/files/system-auth.pamd.0.78
index 7f7e689d7e6e..7f7e689d7e6e 100644
--- a/sys-libs/pam/files/pam.d/system-auth
+++ b/sys-libs/pam/files/system-auth.pamd.0.78
diff --git a/sys-libs/pam/files/pam.d-0.99/system-auth b/sys-libs/pam/files/system-auth.pamd.0.99
index c37035f51067..c37035f51067 100644
--- a/sys-libs/pam/files/pam.d-0.99/system-auth
+++ b/sys-libs/pam/files/system-auth.pamd.0.99
diff --git a/sys-libs/pam/pam-0.78-r3.ebuild b/sys-libs/pam/pam-0.78-r3.ebuild
index 470f69476b1e..561267c2e716 100644
--- a/sys-libs/pam/pam-0.78-r3.ebuild
+++ b/sys-libs/pam/pam-0.78-r3.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/sys-libs/pam/pam-0.78-r3.ebuild,v 1.7 2007/01/23 07:16:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r3.ebuild,v 1.8 2007/07/10 13:49:07 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -328,13 +328,12 @@ src_install() {
 	# need this for pam_console
 	keepdir /var/run/console
 
-	for x in ${FILESDIR}/pam.d/*; do
-		[[ -f ${x} ]] && dopamd ${x}
-	done
+	newpamd "${FILESDIR}/system-auth.pamd.0.78" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
 
 	# Only add this one if needed.
 	if [[ ${FORCE_SYSTEMAUTH_UPDATE} = "yes" ]] ; then
-		newpamd ${FILESDIR}/pam.d/system-auth system-auth.new || \
+		newpamd "${FILESDIR}/system-auth.pamd.0.78" system-auth.new || \
 			die "Failed to install system-auth.new!"
 	fi
 
diff --git a/sys-libs/pam/pam-0.78-r5.ebuild b/sys-libs/pam/pam-0.78-r5.ebuild
index 226463a6c5d9..386cdc86d78b 100644
--- a/sys-libs/pam/pam-0.78-r5.ebuild
+++ b/sys-libs/pam/pam-0.78-r5.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/sys-libs/pam/pam-0.78-r5.ebuild,v 1.16 2007/05/12 09:23:10 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.17 2007/07/10 13:49:07 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -330,13 +330,12 @@ src_install() {
 	# need this for pam_console
 	keepdir /var/run/console
 
-	for x in ${FILESDIR}/pam.d/*; do
-		[[ -f ${x} ]] && dopamd ${x}
-	done
+	newpamd "${FILESDIR}/system-auth.pamd.0.78" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
 
 	# Only add this one if needed.
 	if [[ ${FORCE_SYSTEMAUTH_UPDATE} = "yes" ]] ; then
-		newpamd ${FILESDIR}/pam.d/system-auth system-auth.new || \
+		newpamd "${FILESDIR}/system-auth.pamd.0.78" system-auth.new || \
 			die "Failed to install system-auth.new!"
 	fi
 
diff --git a/sys-libs/pam/pam-0.99.7.1.ebuild b/sys-libs/pam/pam-0.99.7.1.ebuild
index 4003bfa2d2e7..7fd2c8d6de4a 100644
--- a/sys-libs/pam/pam-0.99.7.1.ebuild
+++ b/sys-libs/pam/pam-0.99.7.1.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/sys-libs/pam/pam-0.99.7.1.ebuild,v 1.7 2007/07/08 17:26:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.7.1.ebuild,v 1.8 2007/07/10 13:49:07 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -155,9 +155,8 @@ src_install() {
 	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
 	docinto modules ; dodoc doc/txts/README.*
 
-	for x in "${FILESDIR}/pam.d-0.99/"*; do
-		[[ -f "${x}" ]] && dopamd "${x}"
-	done
+	newpamd "${FILESDIR}/system-auth.pamd.0.99" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
 
 	# Remove the wrongly installed manpage
 	rm -f "${D}"/usr/share/man/man8/pam_userdb.8*
diff --git a/sys-libs/pam/pam-0.99.8.0-r1.ebuild b/sys-libs/pam/pam-0.99.8.0-r1.ebuild
index 62af97ea0a15..dd6200852a00 100644
--- a/sys-libs/pam/pam-0.99.8.0-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.8.0-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/sys-libs/pam/pam-0.99.8.0-r1.ebuild,v 1.1 2007/07/10 13:05:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r1.ebuild,v 1.2 2007/07/10 13:49:07 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -157,7 +157,7 @@ src_install() {
 	docinto modules ; dodoc doc/txts/README.*
 
 	newpamd "${FILESDIR}/system-auth.pamd.epam" system-auth
-	dopamd "${FILESDIR}/pam.d-0.99/other"
+	newpamd "${FILESDIR}/other.pamd" other
 
 	# Remove the wrongly installed manpages
 	rm "${D}"/usr/share/man/man8/pam_userdb.8*
diff --git a/sys-libs/pam/pam-0.99.8.0.ebuild b/sys-libs/pam/pam-0.99.8.0.ebuild
index dc43f626991d..9b9ffed4f84a 100644
--- a/sys-libs/pam/pam-0.99.8.0.ebuild
+++ b/sys-libs/pam/pam-0.99.8.0.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/sys-libs/pam/pam-0.99.8.0.ebuild,v 1.3 2007/07/08 17:26:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0.ebuild,v 1.4 2007/07/10 13:49:07 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -155,9 +155,8 @@ src_install() {
 	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
 	docinto modules ; dodoc doc/txts/README.*
 
-	for x in "${FILESDIR}/pam.d-0.99/"*; do
-		[[ -f "${x}" ]] && dopamd "${x}"
-	done
+	newpamd "${FILESDIR}/system-auth.pamd.0.99" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
 
 	# Remove the wrongly installed manpage
 	rm -f "${D}"/usr/share/man/man8/pam_userdb.8*