Reduce the pamd installation code, remove two directories too.

Package-Manager: portage-2.1.3_rc7

11 files changed, 64 insertions, 70 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/Manifest b/sys-libs/pam/Manifest
index cf10bfe51738..8f221d123549 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -17,6 +17,10 @@ AUX README.pam_console 2619 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf SHA1
 MD5 4d915415e30dcbd724c8054970deec6a files/README.pam_console 2619
 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf files/README.pam_console 2619
 SHA256 edc959cefb01cf0b0a1fc42d43fcb388f7dc5c073166da611fa614ad2953870c files/README.pam_console 2619
+AUX other.pamd 139 RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 SHA1 6d1f1a5f55c65f13b7fd35396c7f302c1946116e SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2
+MD5 2d840b9afde7319bc8a8f7676582af11 files/other.pamd 139
+RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 files/other.pamd 139
+SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2 files/other.pamd 139
 AUX pam-0.78-inttypes.patch 5644 RMD160 02135ec459b34f34a81545c1c841fe1841d8a2a8 SHA1 ee35c51194210352c6cd123cd878be4d755936f4 SHA256 d5b44b15529de83e438833e9be474703392afca186f6054cb646579da1c296d6
 MD5 95b7f27f454b393fd12cdae6d9806866 files/pam-0.78-inttypes.patch 5644
 RMD160 02135ec459b34f34a81545c1c841fe1841d8a2a8 files/pam-0.78-inttypes.patch 5644
@@ -25,26 +29,18 @@ AUX pam-0.78-xauth-path.patch 1935 RMD160 2a45c96daca86f86cc3da7aeba183db128b876
 MD5 2d24596551bb4843bb852d4681d8ec2e files/pam-0.78-xauth-path.patch 1935
 RMD160 2a45c96daca86f86cc3da7aeba183db128b87635 files/pam-0.78-xauth-path.patch 1935
 SHA256 e30877b127eeacdd94d2332cf230d9fad638b2ceda78d6bbdb71ccca9d14149a files/pam-0.78-xauth-path.patch 1935
-AUX pam.d-0.99/other 139 RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 SHA1 6d1f1a5f55c65f13b7fd35396c7f302c1946116e SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2
-MD5 2d840b9afde7319bc8a8f7676582af11 files/pam.d-0.99/other 139
-RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 files/pam.d-0.99/other 139
-SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2 files/pam.d-0.99/other 139
-AUX pam.d-0.99/system-auth 447 RMD160 b2f465067fd0195a09144a65ef97a14b12da33e1 SHA1 d27f9125c536e01d15640511a2009598121409f1 SHA256 3721b2ef99746868ae0e0f3d7c80e32866d9c49823fff8ed32c00adb4dcdea13
-MD5 cec44090480eadbfa8875de6575b732c files/pam.d-0.99/system-auth 447
-RMD160 b2f465067fd0195a09144a65ef97a14b12da33e1 files/pam.d-0.99/system-auth 447
-SHA256 3721b2ef99746868ae0e0f3d7c80e32866d9c49823fff8ed32c00adb4dcdea13 files/pam.d-0.99/system-auth 447
-AUX pam.d/other 139 RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 SHA1 6d1f1a5f55c65f13b7fd35396c7f302c1946116e SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2
-MD5 2d840b9afde7319bc8a8f7676582af11 files/pam.d/other 139
-RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 files/pam.d/other 139
-SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2 files/pam.d/other 139
-AUX pam.d/system-auth 402 RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 SHA1 c421fc1d91a8cac7dbfc84730656219f73aaa22b SHA256 40d7b8409becd389a2ed4b751b85564f03b566ac33ed21c787289da0c4344aeb
-MD5 c3d3871612bfb718a50454c8fba54b64 files/pam.d/system-auth 402
-RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 files/pam.d/system-auth 402
-SHA256 40d7b8409becd389a2ed4b751b85564f03b566ac33ed21c787289da0c4344aeb files/pam.d/system-auth 402
 AUX pam_env.conf 2985 RMD160 feaa4251ed7bb68ecb93e6beb6909203d60ca740 SHA1 f945472cf5ae04150eed1e595d5506227c48fe0d SHA256 e3e0f06d9803d335a31b7e29a5ea6c1aa6c258f6b95308f959a86c23a97fec53
 MD5 f7cb16866a9d0762a5288bc5fd8feecf files/pam_env.conf 2985
 RMD160 feaa4251ed7bb68ecb93e6beb6909203d60ca740 files/pam_env.conf 2985
 SHA256 e3e0f06d9803d335a31b7e29a5ea6c1aa6c258f6b95308f959a86c23a97fec53 files/pam_env.conf 2985
+AUX system-auth.pamd.0.78 402 RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 SHA1 c421fc1d91a8cac7dbfc84730656219f73aaa22b SHA256 40d7b8409becd389a2ed4b751b85564f03b566ac33ed21c787289da0c4344aeb
+MD5 c3d3871612bfb718a50454c8fba54b64 files/system-auth.pamd.0.78 402
+RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 files/system-auth.pamd.0.78 402
+SHA256 40d7b8409becd389a2ed4b751b85564f03b566ac33ed21c787289da0c4344aeb files/system-auth.pamd.0.78 402
+AUX system-auth.pamd.0.99 447 RMD160 b2f465067fd0195a09144a65ef97a14b12da33e1 SHA1 d27f9125c536e01d15640511a2009598121409f1 SHA256 3721b2ef99746868ae0e0f3d7c80e32866d9c49823fff8ed32c00adb4dcdea13
+MD5 cec44090480eadbfa8875de6575b732c files/system-auth.pamd.0.99 447
+RMD160 b2f465067fd0195a09144a65ef97a14b12da33e1 files/system-auth.pamd.0.99 447
+SHA256 3721b2ef99746868ae0e0f3d7c80e32866d9c49823fff8ed32c00adb4dcdea13 files/system-auth.pamd.0.99 447
 AUX system-auth.pamd.epam 473 RMD160 10d2728461840f3089778bf2535f1c11c7abe8a4 SHA1 fb500e4d9f1b7409e69af2009abfc55ab83bd5cc SHA256 67cc7386b321cf71879bfdd7bcf10bb60153f7fbd825de30423f008ebdc9626e
 MD5 30f2e7976c64d115b9ab913951bda755 files/system-auth.pamd.epam 473
 RMD160 10d2728461840f3089778bf2535f1c11c7abe8a4 files/system-auth.pamd.epam 473
@@ -58,30 +54,30 @@ DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SH
 DIST glib-2.6.5.tar.bz2 2357089 RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e SHA1 82818f9173b0bdc2b26af018e8393eb76318552e SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
 DIST pam-0.78-patches-1.3.tar.bz2 87223 RMD160 82f6f63de5209e26119ed430e80669f6306cd9ea SHA1 722f326474c29a10f62f335ae6ed9ad238449560 SHA256 ca6882263a474ed77a343572a6a30fa59d677929543feb72cb0801b3bfdc8266
 DIST pam-0.78-patches-1.5.tar.bz2 87590 RMD160 9a315fbb92ecbcea4ab5cce19fb0471ce141b031 SHA1 6829088338f51ccc0d4211cc14accdbc5ddd7e57 SHA256 d692f2aa27ab8943268eee233c23ee2e1c746ad61afeca691473b2587a370d12
-EBUILD pam-0.78-r3.ebuild 11282 RMD160 a8d75826a0336bce3ae83ddf92a19f065f0b2aa7 SHA1 d82adc69543e3e4b661ec45c5b1756b43c95eb43 SHA256 8f8818f59297491c0efed684fc2136c77a46bd47360ab70d6d627c05ff1339e0
-MD5 2fb7a850ebcbf8efafcb86742e162d41 pam-0.78-r3.ebuild 11282
-RMD160 a8d75826a0336bce3ae83ddf92a19f065f0b2aa7 pam-0.78-r3.ebuild 11282
-SHA256 8f8818f59297491c0efed684fc2136c77a46bd47360ab70d6d627c05ff1339e0 pam-0.78-r3.ebuild 11282
-EBUILD pam-0.78-r5.ebuild 11399 RMD160 e383bbea115e25cd1dd53cc06bbb838d42e29aec SHA1 9e7e08a74b14647c04e00253d7c102edab1ede9a SHA256 b74325e8eb373cf62b8edef7569d86ef412ea051606feeed53fc2f8138ab9cb6
-MD5 b03d3115f011f9e0360987b0271fcce0 pam-0.78-r5.ebuild 11399
-RMD160 e383bbea115e25cd1dd53cc06bbb838d42e29aec pam-0.78-r5.ebuild 11399
-SHA256 b74325e8eb373cf62b8edef7569d86ef412ea051606feeed53fc2f8138ab9cb6 pam-0.78-r5.ebuild 11399
-EBUILD pam-0.99.7.1.ebuild 4857 RMD160 6a04b8a282bd2ad65d28e75f498ab1450f312bb8 SHA1 d19f47ffb370aeae83f4fa001086a41cc21cdf8b SHA256 d03cc19c42d35c1962aea9f5b6f002b8666ac4ed35af3a44cceef0f682f47740
-MD5 93495c0d4507c21ae93d6da57ba7d787 pam-0.99.7.1.ebuild 4857
-RMD160 6a04b8a282bd2ad65d28e75f498ab1450f312bb8 pam-0.99.7.1.ebuild 4857
-SHA256 d03cc19c42d35c1962aea9f5b6f002b8666ac4ed35af3a44cceef0f682f47740 pam-0.99.7.1.ebuild 4857
-EBUILD pam-0.99.8.0-r1.ebuild 5192 RMD160 d0e00f137d393e0eb884f3ee20b626a3a1ed8a51 SHA1 d7a28007d4a2a59f62e5129e60a617ca4b001fcf SHA256 b839070ebc1b0e2b78ec53bccc82be2b0eef04f4bb15690ae695866184b06b70
-MD5 644f2971da3278f1e80f1c52d016c722 pam-0.99.8.0-r1.ebuild 5192
-RMD160 d0e00f137d393e0eb884f3ee20b626a3a1ed8a51 pam-0.99.8.0-r1.ebuild 5192
-SHA256 b839070ebc1b0e2b78ec53bccc82be2b0eef04f4bb15690ae695866184b06b70 pam-0.99.8.0-r1.ebuild 5192
-EBUILD pam-0.99.8.0.ebuild 4846 RMD160 d3bbcf106aee50cba2bb92c61f092731ab712503 SHA1 b42afab797d93407c73ffc3d855a243f881d77eb SHA256 0809c4ba7dd699c70024f65b3bb5d4b7826aad859791b7f842576231ab1a0150
-MD5 eec37e26e0831a9da6b6b0f199e27dfa pam-0.99.8.0.ebuild 4846
-RMD160 d3bbcf106aee50cba2bb92c61f092731ab712503 pam-0.99.8.0.ebuild 4846
-SHA256 0809c4ba7dd699c70024f65b3bb5d4b7826aad859791b7f842576231ab1a0150 pam-0.99.8.0.ebuild 4846
-MISC ChangeLog 25552 RMD160 7a58be630d28d3631f73533ee00b6dbd3fed8690 SHA1 0ac25816f821277bfb2fc5794ae8a633c3d68178 SHA256 c36669bb625203fe8dfc5c6788e901a01597332cef84f4f1fbb66489e2d5ad56
-MD5 560ab663a56b0a0faf0f57e5277a8ebe ChangeLog 25552
-RMD160 7a58be630d28d3631f73533ee00b6dbd3fed8690 ChangeLog 25552
-SHA256 c36669bb625203fe8dfc5c6788e901a01597332cef84f4f1fbb66489e2d5ad56 ChangeLog 25552
+EBUILD pam-0.78-r3.ebuild 11314 RMD160 710b5f88d5823770c2c80c6a4288f4a3cad87168 SHA1 ec110583288577b3374f828fe158d0363fb9795f SHA256 d9a2f0c404b047724e99565e44fab7e70693c033df8d17024f16c984fba511d0
+MD5 6b0506fc8bcc4fdd891d6c24752de739 pam-0.78-r3.ebuild 11314
+RMD160 710b5f88d5823770c2c80c6a4288f4a3cad87168 pam-0.78-r3.ebuild 11314
+SHA256 d9a2f0c404b047724e99565e44fab7e70693c033df8d17024f16c984fba511d0 pam-0.78-r3.ebuild 11314
+EBUILD pam-0.78-r5.ebuild 11435 RMD160 402e95b858644b4b03648be3896f51a47e18fa86 SHA1 286330af0ab781455aef91e23f3247dfea3e9b65 SHA256 98432e7cabdc53f4d11281f36b7e65e875138ec7886b66e5613cdf485cab5b83
+MD5 3893b721a07b47fdbad9438bb6118be8 pam-0.78-r5.ebuild 11435
+RMD160 402e95b858644b4b03648be3896f51a47e18fa86 pam-0.78-r5.ebuild 11435
+SHA256 98432e7cabdc53f4d11281f36b7e65e875138ec7886b66e5613cdf485cab5b83 pam-0.78-r5.ebuild 11435
+EBUILD pam-0.99.7.1.ebuild 4872 RMD160 e34d44138b7312b5d79e51822bdbc20d44c71c35 SHA1 09a252ee65d1b7e8b82f1255b2ab70f0e3bca011 SHA256 cebdeec5fb3e413b5370025278dd7017c0d3851f07bcf08e4a3a21f783cd0531
+MD5 b5cd722e692ad33ae9f9985466cc882d pam-0.99.7.1.ebuild 4872
+RMD160 e34d44138b7312b5d79e51822bdbc20d44c71c35 pam-0.99.7.1.ebuild 4872
+SHA256 cebdeec5fb3e413b5370025278dd7017c0d3851f07bcf08e4a3a21f783cd0531 pam-0.99.7.1.ebuild 4872
+EBUILD pam-0.99.8.0-r1.ebuild 5193 RMD160 73c05f92d10c7fdacc98833ec2bab50d4971e33e SHA1 20dc2a20557db4dcafb6160127e35292ab6604a1 SHA256 8e6372ccd38176b0cf47af5a1a70020186481f2bfad79968a94f50119253804f
+MD5 d7730ac9c9835e80ad498805b34e3ca7 pam-0.99.8.0-r1.ebuild 5193
+RMD160 73c05f92d10c7fdacc98833ec2bab50d4971e33e pam-0.99.8.0-r1.ebuild 5193
+SHA256 8e6372ccd38176b0cf47af5a1a70020186481f2bfad79968a94f50119253804f pam-0.99.8.0-r1.ebuild 5193
+EBUILD pam-0.99.8.0.ebuild 4861 RMD160 b2f177f0e916cd660a107bba161f5f52471f1fe5 SHA1 d2b21b22dd699c7275abc713a2832c32b54f2c4e SHA256 26a01ccbf666fa2c9f2bdecf4aaca257ce1767eceb8cedf032c1a58131807299
+MD5 0b81acacef9371f980836006579ba4f8 pam-0.99.8.0.ebuild 4861
+RMD160 b2f177f0e916cd660a107bba161f5f52471f1fe5 pam-0.99.8.0.ebuild 4861
+SHA256 26a01ccbf666fa2c9f2bdecf4aaca257ce1767eceb8cedf032c1a58131807299 pam-0.99.8.0.ebuild 4861
+MISC ChangeLog 25968 RMD160 6261115e3530a22affbc473a772d2d4cafaf3eef SHA1 79a86749e9b0cf9055f6d499c2d779e3f62b8b31 SHA256 e6329b21ef7b1151bb0b7ebb1503fd49dae59393bdc732e9ac928f772045374c
+MD5 39e3bd3cfcd2dc0c198927258d123f4d ChangeLog 25968
+RMD160 6261115e3530a22affbc473a772d2d4cafaf3eef ChangeLog 25968
+SHA256 e6329b21ef7b1151bb0b7ebb1503fd49dae59393bdc732e9ac928f772045374c ChangeLog 25968
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -104,7 +100,7 @@ SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGk4RHAiZjviIA2XgRAhiSAJ0S/x6+kR0/aV7n7fLz0nlRUjI3kACg3Ban
-v1d+nfjaraE98RrxxdXIMsk=
-=ENGx
+iD8DBQFGk46LAiZjviIA2XgRAl1qAKC+mPVv1g4XoFDCI2bRS5clboItsQCeMBAH
+y3gL1hfSBM2JYw4ZDmr1y/s=
+=/KH8
 -----END PGP SIGNATURE-----
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*