Don't report pam_chroot as deprecated, as it's now in portage (thanks Ali Polatel, hawking). Remove previous 0.99 series, before stabling Linux-PAM we need to give time to pam_chroot to settle down a bit at least.

Package-Manager: portage-2.1.3_rc7

9 files changed, 35 insertions, 443 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index fda462a350f6..ecd671c9beb5 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.162 2007/07/10 14:18:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.163 2007/07/12 09:22:59 flameeyes Exp $
+
+  12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.6.3-berkdb.patch, -files/system-auth.pamd.0.99,
+  -pam-0.99.7.1.ebuild, -pam-0.99.8.0.ebuild, pam-0.99.8.0-r1.ebuild:
+  Don't report pam_chroot as deprecated, as it's now in portage (thanks Ali
+  Polatel, hawking). Remove previous 0.99 series, before stabling Linux-PAM we
+  need to give time to pam_chroot to settle down a bit at least.
 
   10 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/pam-0.78-inttypes.patch, -files/pam-0.78-xauth-path.patch,
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 01e349b5a57f..968cc035b0d3 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Linux-PAM-0.99.6.3-berkdb.patch 838 RMD160 1ff17ac66486b0c33c23b1829362a457a8065fe1 SHA1 91db57bfebaf69a99da2f350a321ac2ccdba3181 SHA256 34c7f67cf69812eac99f1504cdeb7e4ab7bb89938d7d106b616890933d2a0b8b
-MD5 69b1526da99a2f80ff5f49f6cadb9591 files/Linux-PAM-0.99.6.3-berkdb.patch 838
-RMD160 1ff17ac66486b0c33c23b1829362a457a8065fe1 files/Linux-PAM-0.99.6.3-berkdb.patch 838
-SHA256 34c7f67cf69812eac99f1504cdeb7e4ab7bb89938d7d106b616890933d2a0b8b files/Linux-PAM-0.99.6.3-berkdb.patch 838
 AUX Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 SHA1 7b578fedf5ee73f82575feadfeea7a8d5b98bda0 SHA256 e4deb0732039dd29774248bb33271d578c69b76f86c015e8ffd296fa2bb6be3b
 MD5 19573ee9b3a013175631941519534900 files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667
 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667
@@ -21,17 +17,11 @@ AUX system-auth.pamd.0.78 402 RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 SH
 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
 SHA256 67cc7386b321cf71879bfdd7bcf10bb60153f7fbd825de30423f008ebdc9626e files/system-auth.pamd.epam 473
 DIST Linux-PAM-0.78.tar.gz 488936 RMD160 51643a8942267449b884f79804102fad61567df8 SHA1 fee3e519ac19dff64f7b14ecfa69c09d34411ebe SHA256 a18b9f7b45344a4e49d2647c036894cc6578f249fa0cf024763f1140df684d3e
-DIST Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551 RMD160 14a84d38bf4643f55a5a93400aa0b4fefb9fc30b SHA1 73105f9826b1954a969ea5db0f28e38e27f636f4 SHA256 0436acbf46269bf664505d3dff1d80eeb168c9a9b50878401e6414663ca2c392
-DIST Linux-PAM-0.99.7.1.tar.bz2 872588 RMD160 b705904a568d7badd3922665d2d019e434cc72ee SHA1 40f8ba7280fbd8260cfe2ec06b86f972c79eb9d2 SHA256 d5f3756bbb61a27adc2d16842ea6d867c9c1830a2c9577f71bb9fe14859ac96a
 DIST Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554 RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 SHA1 20095fa64eb87644efc7ae41ca87d9a42065fbe2 SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336
 DIST Linux-PAM-0.99.8.0.tar.bz2 903366 RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 SHA1 c344c7887d80eae5dc1ab7ac3ebfb412d555c4cf SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2
 DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SHA1 8fddfe98d5ff7fcdb3fe9e23bb361d8f20a35941 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244
@@ -41,22 +31,14 @@ EBUILD pam-0.78-r5.ebuild 11384 RMD160 1c925c7ddbdd14d31745b24f71f497f03827d2fc
 MD5 d53943e195dac9c8de5426327142ada0 pam-0.78-r5.ebuild 11384
 RMD160 1c925c7ddbdd14d31745b24f71f497f03827d2fc pam-0.78-r5.ebuild 11384
 SHA256 10b3c08b86442cfd742383040b72fe44fbd927bf77d001d08971b47ec39704e5 pam-0.78-r5.ebuild 11384
-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 26327 RMD160 19f065be5424d20726a93def4269a04c903c276c SHA1 904978ab169a518e576c87f1fa6a412a9b718351 SHA256 8c753da2e93fb7de7aba91ec75bb615a239255b91ff07780708f7ae4e10f144f
-MD5 b74a6597e3fb582ee225ef2afad9a7a3 ChangeLog 26327
-RMD160 19f065be5424d20726a93def4269a04c903c276c ChangeLog 26327
-SHA256 8c753da2e93fb7de7aba91ec75bb615a239255b91ff07780708f7ae4e10f144f ChangeLog 26327
+EBUILD pam-0.99.8.0-r1.ebuild 4990 RMD160 4297297100857eaad3fad07402d62eeaea7dd337 SHA1 911b66a996ec74744078dc2611abb3ef942960b5 SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984
+MD5 a86bbc0fc931e48e3901c55d8d16113c pam-0.99.8.0-r1.ebuild 4990
+RMD160 4297297100857eaad3fad07402d62eeaea7dd337 pam-0.99.8.0-r1.ebuild 4990
+SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984 pam-0.99.8.0-r1.ebuild 4990
+MISC ChangeLog 26743 RMD160 c07e1d0ff0f293dee40467545a7adcabf591bed6 SHA1 cc7bda758618ccec1dc650e3f2b4abac880c65bc SHA256 15d8a5503e8368caaa161e7bc50fbdf78d8bbb5ff2bf89b1ba79d9694794b6bd
+MD5 a9525e3b36f45271a66eb8d117682e9d ChangeLog 26743
+RMD160 c07e1d0ff0f293dee40467545a7adcabf591bed6 ChangeLog 26743
+SHA256 15d8a5503e8368caaa161e7bc50fbdf78d8bbb5ff2bf89b1ba79d9694794b6bd ChangeLog 26743
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -64,19 +46,13 @@ SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata
 MD5 4acd467a58a6a83f640e9540babb2be6 files/digest-pam-0.78-r5 976
 RMD160 f272466c7321cec1715f9dd69818b7b79ca3582f files/digest-pam-0.78-r5 976
 SHA256 48f4d33093f701c4ac0ae848f7c51efb85d363679529908a980970bc861050c3 files/digest-pam-0.78-r5 976
-MD5 7e383728a5d0fe763e5a1e1cc1d07427 files/digest-pam-0.99.7.1 572
-RMD160 394ee12bca7c862a67e820a3b77d25cf5e123725 files/digest-pam-0.99.7.1 572
-SHA256 fd48ed29e798f9d699a8c0ecb394b65890da0993209b4ee9d7d1a036f7b8943f files/digest-pam-0.99.7.1 572
-MD5 53b6bc418321f8a2c39abffbf7a34fa9 files/digest-pam-0.99.8.0 572
-RMD160 9480c4d4df0fcbabf3f486d6e3a390949b148825 files/digest-pam-0.99.8.0 572
-SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/digest-pam-0.99.8.0 572
 MD5 53b6bc418321f8a2c39abffbf7a34fa9 files/digest-pam-0.99.8.0-r1 572
 RMD160 9480c4d4df0fcbabf3f486d6e3a390949b148825 files/digest-pam-0.99.8.0-r1 572
 SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/digest-pam-0.99.8.0-r1 572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGk5VOAiZjviIA2XgRAuyxAJ42AMPl+EBz74rYFlfwQ7J71mBU3gCfcn9x
-5605Tl6TcJI5WbuelXQQfOo=
-=7sEg
+iD8DBQFGlfM6AiZjviIA2XgRAgCIAJ0UNHq95GJ5rIyWy9vSAeqekG5QTwCeP6DN
+zFhzKX9+q08/EDh4xR8+Tlo=
+=4N5X
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch
deleted file mode 100644
index 2d811ae6e0da..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Linux-PAM-0.99.6.3/configure.in
-===================================================================
---- Linux-PAM-0.99.6.3.orig/configure.in
-+++ Linux-PAM-0.99.6.3/configure.in
-@@ -329,6 +329,11 @@ AC_SEARCH_LIBS([crypt],[xcrypt crypt], L
- LIBS=$BACKUP_LIBS
- AC_SUBST(LIBCRYPT)
- 
-+AC_ARG_ENABLE([berkdb],
-+	AC_HELP_STRING([--disable-berkdb],[do not use Berkeley DB]),
-+	WITH_BERKDB=$enableval, WITH_BERKDB=yes)
-+
-+if test "x$WITH_BERKDB" = "xyes"; then
- dnl check for libdb or libndbm as fallback. Some libndbm compat
- dnl libraries are unuseable, so try libdb first.
- AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
-@@ -344,6 +349,8 @@ else
-     AC_CHECK_HEADERS(db.h)
- fi
- AC_SUBST(LIBDB)
-+fi
-+
- AM_CONDITIONAL([HAVE_LIBDB], [test ! -z "$LIBDB"])
- 
- AC_CHECK_LIB([nsl],[yp_get_default_domain], LIBNSL="-lnsl", LIBNSL="")
diff --git a/sys-libs/pam/files/digest-pam-0.99.7.1 b/sys-libs/pam/files/digest-pam-0.99.7.1
deleted file mode 100644
index 5bcd595ca6ac..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 45ba2ac18dcca996ff63c3968c604451 Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-RMD160 14a84d38bf4643f55a5a93400aa0b4fefb9fc30b Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-SHA256 0436acbf46269bf664505d3dff1d80eeb168c9a9b50878401e6414663ca2c392 Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-MD5 385458dfb4633071594e255a6ebec9da Linux-PAM-0.99.7.1.tar.bz2 872588
-RMD160 b705904a568d7badd3922665d2d019e434cc72ee Linux-PAM-0.99.7.1.tar.bz2 872588
-SHA256 d5f3756bbb61a27adc2d16842ea6d867c9c1830a2c9577f71bb9fe14859ac96a Linux-PAM-0.99.7.1.tar.bz2 872588
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.0 b/sys-libs/pam/files/digest-pam-0.99.8.0
deleted file mode 100644
index 0ae5144edf74..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.8.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dd508b5289b554630be66ea1f2a9ea52 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
-MD5 e05a9a1e95ec9bcfa5c09d44f46ad943 Linux-PAM-0.99.8.0.tar.bz2 903366
-RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 Linux-PAM-0.99.8.0.tar.bz2 903366
-SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2 Linux-PAM-0.99.8.0.tar.bz2 903366
diff --git a/sys-libs/pam/files/system-auth.pamd.0.99 b/sys-libs/pam/files/system-auth.pamd.0.99
deleted file mode 100644
index c37035f51067..000000000000
--- a/sys-libs/pam/files/system-auth.pamd.0.99
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_env.so
-auth       sufficient	pam_unix.so try_first_pass likeauth nullok
-auth       required	pam_deny.so
-
-account    required	pam_unix.so
-
-password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
-password   sufficient	pam_unix.so try_first_pass use_authtok nullok md5 shadow
-password   required	pam_deny.so
-
-session    required	pam_limits.so
-session    required	pam_unix.so
diff --git a/sys-libs/pam/pam-0.99.7.1.ebuild b/sys-libs/pam/pam-0.99.7.1.ebuild
deleted file mode 100644
index 7fd2c8d6de4a..000000000000
--- a/sys-libs/pam/pam-0.99.7.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.8 2007/07/10 13:49:07 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils autotools pam toolchain-funcs
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.bz2"
-
-LICENSE="PAM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls elibc_FreeBSD selinux vim-syntax"
-
-RDEPEND="nls? ( virtual/libintl )
-	>=sys-libs/cracklib-2.8.3
-	sys-libs/pwdb
-	selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no more supported, and since version"
-		eerror "0.99 is no more installed, nor provided by any other package."
-		eerror "The package will be built (to allow binary package builds), but will"
-		eerror "not be installed."
-		eerror "Please replace pam_stack usage with proper include directive usage,"
-		eerror "following the PAM Upgrade guide at the following URL"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-		ebeep 15
-
-		retval=1
-	fi
-
-	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|chroot)'; then
-		eerror ""
-		eerror "Your current setup is using one or more of the following modules,"
-		eerror "that are not built or supported anymore:"
-		eerror "pam_pwdb, pam_radius, pam_timestamp, pam_chroot"
-		eerror "If you are in real need for these modules, please contact the maintainers"
-		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
-		eerror "use cases."
-		ebeep 10
-
-		retval=1
-	fi
-
-	# Produce the warnings only during upgrade, for the following two
-	has_version '<sys-libs/pam-0.99' || return $retval
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_console.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_console module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_console."
-		ewarn ""
-		ebeep 5
-	fi
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_userdb.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_userdb module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_userdb."
-		ewarn ""
-		ebeep 5
-	fi
-
-	return $retval
-}
-
-pkg_setup() {
-	check_old_modules
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	mkdir -p doc/txts
-	for readme in modules/pam_*/README; do
-		cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
-			sed -e 's|^modules/||')
-	done
-
-	epatch "${FILESDIR}/${MY_PN}-0.99.6.3-berkdb.patch"
-	epatch "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
-	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
-
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		--disable-berkdb \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		--enable-docdir=/usr/share/doc/${PF} \
-		--disable-regenerate-man \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# Need to be suid
-	fperms u+s /sbin/unix_chkpwd
-
-	dodir /$(get_libdir)
-	mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
-	mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
-	mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
-	gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
-
-	# No, we don't really need .la files for PAM modules.
-	rm -f "${D}/$(get_libdir)/security/"*.la
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
-	docinto modules ; dodoc doc/txts/README.*
-
-	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*
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
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 dd6200852a00..43b78a46cea1 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.2 2007/07/10 13:49:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r1.ebuild,v 1.3 2007/07/12 09:22:59 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -53,11 +53,11 @@ check_old_modules() {
 		retval=1
 	fi
 
-	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|chroot)'; then
+	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp)'; then
 		eerror ""
 		eerror "Your current setup is using one or more of the following modules,"
 		eerror "that are not built or supported anymore:"
-		eerror "pam_pwdb, pam_radius, pam_timestamp, pam_chroot"
+		eerror "pam_pwdb, pam_radius, pam_timestamp"
 		eerror "If you are in real need for these modules, please contact the maintainers"
 		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
 		eerror "use cases."
@@ -69,25 +69,19 @@ check_old_modules() {
 	# Produce the warnings only during upgrade, for the following two
 	has_version '<sys-libs/pam-0.99' || return $retval
 
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_console.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_console module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_console."
-		ewarn ""
-		ebeep 5
-	fi
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_userdb.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_userdb module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_userdb."
-		ewarn ""
-		ebeep 5
-	fi
+	# This works only for those modules that are moved to sys-auth/$module, or the
+	# message will be wrong.
+	for module in pam_chroot pam_console pam_userdb; do
+		if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q ${module}.so; then
+			ewarn ""
+			ewarn "Your current setup is using the ${module} module."
+			ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
+			ewarn "anymore; if you want to continue using this module, you should install"
+			ewarn "sys-auth/${module}."
+			ewarn ""
+			ebeep 5
+		fi
+	done
 
 	return $retval
 }
diff --git a/sys-libs/pam/pam-0.99.8.0.ebuild b/sys-libs/pam/pam-0.99.8.0.ebuild
deleted file mode 100644
index 9b9ffed4f84a..000000000000
--- a/sys-libs/pam/pam-0.99.8.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.4 2007/07/10 13:49:07 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils autotools pam toolchain-funcs
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.bz2"
-
-LICENSE="PAM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls elibc_FreeBSD selinux vim-syntax"
-
-RDEPEND="nls? ( virtual/libintl )
-	>=sys-libs/cracklib-2.8.3
-	sys-libs/pwdb
-	selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no more supported, and since version"
-		eerror "0.99 is no more installed, nor provided by any other package."
-		eerror "The package will be built (to allow binary package builds), but will"
-		eerror "not be installed."
-		eerror "Please replace pam_stack usage with proper include directive usage,"
-		eerror "following the PAM Upgrade guide at the following URL"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-		ebeep 15
-
-		retval=1
-	fi
-
-	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|chroot)'; then
-		eerror ""
-		eerror "Your current setup is using one or more of the following modules,"
-		eerror "that are not built or supported anymore:"
-		eerror "pam_pwdb, pam_radius, pam_timestamp, pam_chroot"
-		eerror "If you are in real need for these modules, please contact the maintainers"
-		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
-		eerror "use cases."
-		ebeep 10
-
-		retval=1
-	fi
-
-	# Produce the warnings only during upgrade, for the following two
-	has_version '<sys-libs/pam-0.99' || return $retval
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_console.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_console module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_console."
-		ewarn ""
-		ebeep 5
-	fi
-
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_userdb.so; then
-		ewarn ""
-		ewarn "Your current setup is using the pam_userdb module."
-		ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"
-		ewarn "anymore; if you want to continue using this module, you should install"
-		ewarn "sys-auth/pam_userdb."
-		ewarn ""
-		ebeep 5
-	fi
-
-	return $retval
-}
-
-pkg_setup() {
-	check_old_modules
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	mkdir -p doc/txts
-	for readme in modules/pam_*/README; do
-		cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
-			sed -e 's|^modules/||')
-	done
-
-	epatch "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
-	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
-	epatch "${FILESDIR}/${MY_P}-setlocale.patch"
-
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		--disable-db \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		--enable-docdir=/usr/share/doc/${PF} \
-		--disable-regenerate-man \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# Need to be suid
-	fperms u+s /sbin/unix_chkpwd
-
-	dodir /$(get_libdir)
-	mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
-	mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
-	mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
-	gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
-
-	# No, we don't really need .la files for PAM modules.
-	rm -f "${D}/$(get_libdir)/security/"*.la
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
-	docinto modules ; dodoc doc/txts/README.*
-
-	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*
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}