Cleanup old ebuilds and files; add patches to disable libxcrypt automagic dependency (bug #317195).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

11 files changed, 81 insertions, 545 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index e5fd00c136d5..d18253b9f8ca 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.257 2010/04/06 05:39:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.258 2010/04/26 12:04:09 flameeyes Exp $
+
+  26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch, -pam-1.0.4.ebuild,
+  -files/Linux-PAM-1.0.4-fix-tests.patch, pam-1.1.0.ebuild,
+  +files/Linux-PAM-1.1.0-xcrypt.patch, -pam-1.1.1.ebuild,
+  -pam-1.1.1-r1.ebuild, pam-1.1.1-r2.ebuild,
+  +files/Linux-PAM-1.1.1-xcrypt.patch:
+  Cleanup old ebuilds and files; add patches to disable libxcrypt automagic
+  dependency (bug #317195).
 
 *pam-1.1.1-r2 (06 Apr 2010)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 4b433e23cea7..a1f967810e3b 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 SHA1 7b578fedf5ee73f82575feadfeea7a8d5b98bda0 SHA256 e4deb0732039dd29774248bb33271d578c69b76f86c015e8ffd296fa2bb6be3b
 AUX Linux-PAM-0.99.8.1-xtests.patch 726 RMD160 4740f7039305c2520add212a576c9f16eb6c0db9 SHA1 716cd42c4c785db666b6c9911222760285a79e8f SHA256 6dbbadc4d9a5d08e55b381746dffd501bdd7dc07fdcb741b8ac95df07d5e1223
 AUX Linux-PAM-1.0.2-noyp.patch 7368 RMD160 6b5b2096670775cb0425ecbc46c33370fbe5bb55 SHA1 1225c8db75a4830767fbb0cbf8d89e4209651810 SHA256 a4c848f42bc8318344514de319473d2fce5d7e7c7ba5d4a03d60545c643b6425
-AUX Linux-PAM-1.0.4-fix-tests.patch 377 RMD160 8e8a27b78f02e4f8ed7e69f150e3ce5d4bd0a023 SHA1 aeae82aa6a298b899273dea6e99e4e1b2b446a38 SHA256 c0ff81fdf941c179f22050f2c5081ad4c70bbabb1aa29d3a64f87d0ab2e8060c
 AUX Linux-PAM-1.1.0-debug.patch 565 RMD160 545e499fa45d7ec568387f4ee4fd8474cbfb3210 SHA1 31ee0fab111e55e6df270bb0483ef586d3177472 SHA256 8452c6397bb7dcbd1b7f9dd87c4021014d70adf0ceba6326c7428937503db3e9
 AUX Linux-PAM-1.1.0-nonls.patch 367 RMD160 80ff3ce536e3bf3cb4e4448bf1062972b2b143bf SHA1 f67af3138312092514f61212073392779084d877 SHA256 7777ca2a86e716ee4cc5b2059d45bd526d8d887a81f5ec083a59076245c4a429
 AUX Linux-PAM-1.1.0-uclibc.patch 2643 RMD160 4294e27b8d90d8d9ee93c427d7eaf8af419f72f6 SHA1 aae4eb27892e1671c34d045a2d596d834aeb95e5 SHA256 b20ff20402778ff174694fe059afeecc6e8df8266d8ecae30419c7c930ffa5ae
+AUX Linux-PAM-1.1.0-xcrypt.patch 609 RMD160 115048d4d4d501c03ea5604c0f5bb6f10435fe8b SHA1 2e5cb04fa6d10c3b19800d555e30b590a651583f SHA256 98304d8534bc44c3acbf5300f06a25c30b3ec8ce9e19bcacd6112b8434857398
 AUX Linux-PAM-1.1.1-gentoodb.patch 1145 RMD160 a9f8a6adf67f4804eaf0dab51d48545bf2ab41cf SHA1 48b08cccd47f1fe63d3ac9c048e071c9955bf657 SHA256 7cbb9477d9a83b642e9f2a5e4d9be7c0831b7d131890482c623e08a2193beadc
-DIST Linux-PAM-1.0.4.tar.bz2 1004979 RMD160 8eacf6344663c0ce2f42d374d82d717211ca10e5 SHA1 60146a363b653324d4477dce4a3e999834a2d713 SHA256 13136d438f5748d08dcb2227e44e53a3c611351b96e11891052e0c8c2557f3ca
+AUX Linux-PAM-1.1.1-xcrypt.patch 867 RMD160 8742c63058f01198b3c0bc5e6c0a430c90c65b90 SHA1 0c8830ceb483ff071f2aa5722c16c52183b3de55 SHA256 447b85fd045c688fa995791f58c6be45e73dec071dd43ee9773df1a6b7eb0486
 DIST Linux-PAM-1.1.0-docs.tar.bz2 494697 RMD160 324f4cdabbaaa85ac5afca9babea1bfe21e32285 SHA1 56cdc680d48a3dc1ffbd9becb855a4724d5f39ad SHA256 7d8e4455cf44937ccc0c7fb370d469c9bef33c68979b23f706fb37727bf8812b
 DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead396e5 SHA1 1ef5b91bf483ecf31e8f07c3c0322b397b13af70 SHA256 139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
 DIST Linux-PAM-1.1.1-docs.tar.bz2 495534 RMD160 182639c3fa79c96dbc263f2d16346345949bb0c8 SHA1 9e25f276546844bb5a58f30b5e5d5a97d25c5af5 SHA256 89950180aba6e5e05671c43d970d9738fd2b71b1421a2cf4d504f5c529586ac6
 DIST Linux-PAM-1.1.1.tar.bz2 1120055 RMD160 2d3c39cb2c3542d380e1331fef08c7086cc829d9 SHA1 8baf11b04396230ba7cf8b2bfb2d2bd75aab8fa6 SHA256 608d3eb9d7a5e1a7505fff62e6a583fdb6e52dc05bf54dc9661c5f395b1fb904
-EBUILD pam-1.0.4.ebuild 5778 RMD160 cc4dc0e2c775d5a1ade189654b4a8d2614e9e2ec SHA1 f51fcb9195440795755227b704e5a32ba7ce720c SHA256 89c7add87128c0e1089ddc93074f615f08e49f19fcde8d8ffe71de85e9ea00af
-EBUILD pam-1.1.0.ebuild 4911 RMD160 86cfa5eaca074ae876bc400ba2bac9f8d3082025 SHA1 016a2ac400f6902ab3567237223df54c9486c4cd SHA256 b87c7ce54a38611a884d272e0b925e7049d4cb1609ec8d31de971c261947ddcb
-EBUILD pam-1.1.1-r1.ebuild 4949 RMD160 4d401000d0f5121cbede80d82f2f7bc449f7e001 SHA1 235719e53d80252c520b59e6ba7d77cfac5e9603 SHA256 89c9bff232de9797d870cc161c3a800c246d3a6a998b8bd40cfe3c9afd36c436
-EBUILD pam-1.1.1-r2.ebuild 5071 RMD160 7a8e8bc0efb30054393fabada93b6f2b4aca7b23 SHA1 e973e3ed8db12308b41f8ee9b1b2cb6360493197 SHA256 fe765b73b9014174ef6e698cdbcefc292c613692ee9ec4a0b17a7d05141c454a
-EBUILD pam-1.1.1.ebuild 4773 RMD160 71c0046202e92c8c4eab14116bcbb0b72a8bce54 SHA1 11125dd3db0fbd65d12e7bc413d5d5ecc75b1f32 SHA256 21b5341e6c8d90c8b1468d53c18eb3e28c9936c8bdae31ac57b5858903d0dc08
-MISC ChangeLog 41264 RMD160 47f5652ee1105f2213e4cf114fcb60c7837d08c6 SHA1 a36f23c8241641ce00318b28615a48d4d47b452f SHA256 ef8cfd4f08d3f8f18e5ecc9f35802c48f4f82050ba309d679cb6b9b85f7a467e
+EBUILD pam-1.1.0.ebuild 5250 RMD160 72b539e4564fc086b55202216c4b42ca20b7790c SHA1 a5ea008a77a8538e299331f4979097047c66cbcb SHA256 d119aedf71062fbb30a5d818df9bccdaa7ef170c3af479858793964a18c96fbd
+EBUILD pam-1.1.1-r2.ebuild 5566 RMD160 27852232e3642f5e4f1ffe047a7d34199e22b59e SHA1 b490d2be67f5271d553e5ea492ec4bfe54b930f1 SHA256 e3375c52945bda35e29b3df9a557bba0c036b1a61ed10da04febbf063b0711eb
+MISC ChangeLog 41709 RMD160 d94563a9c380386183b0d4fe4270cb8a888ea3c5 SHA1 4f14ebd6d44b3581ecdb0a47866f8358f6a3f7d6 SHA256 b0ab04ca30f83517cbc71a7d2a59a9dacb735bcedfb7fd439a38876ac2d6b687
 MISC metadata.xml 1129 RMD160 a800f5ac4255ca20c26791ff0b57c3c923666623 SHA1 99e58550271cf1c3e23c4547387469a0d211ae55 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku6ySUACgkQOypDUo0oQOrtXACgwUIcmKZMXr4Nil4aBtzwrwUs
-IzUAnR+W0CKtclVKHozUU6Blt18Vvyso
-=OrMv
+iEYEARECAAYFAkvVgUYACgkQAiZjviIA2Xi9lwCg1JibCgsTv0zcAiB+LFD+G3cK
++qEAoNMB2RaPgmXKteSLbPvO0OtEig9p
+=ZJbT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch b/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
deleted file mode 100644
index a988b18bf7ed..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: Linux-PAM-0.99.7.0/configure.in
-===================================================================
---- Linux-PAM-0.99.7.0.orig/configure.in
-+++ Linux-PAM-0.99.7.0/configure.in
-@@ -420,10 +420,12 @@ AC_CHECK_FUNCS(inet_ntop inet_pton ruser
- AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
- AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
- 
-+AC_ARG_ENABLE([regenerate-man],
-+  AC_HELP_STRING([--disable-regenerate-man], [Don't re-build manpages from XML souces]),
-+  [enable_man=$enableval], [enable_man=yes])
- dnl
- dnl Check for xsltproc
- dnl
--enable_man=yes
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- if test -z "$XSLTPROC"; then
-      enable_man=no
diff --git a/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch b/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
deleted file mode 100644
index b705f3655ce3..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
-===================================================================
---- Linux-PAM-1.0.4.orig/tests/tst-pam_mkargv.c
-+++ Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
-@@ -35,7 +35,7 @@ int main(void)
-   printf ("\n");
- #endif
- 
--  if (argvlen != 333)
-+  if (argvlen != ( 37 + ( 37 * sizeof(char*) ) ))
-     return 1;
- 
-   if (myargc != 4)
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch
new file mode 100644
index 000000000000..4f4872db6bde
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch
@@ -0,0 +1,16 @@
+Index: Linux-PAM-1.1.1/configure.in
+===================================================================
+--- Linux-PAM-1.1.1.orig/configure.in
++++ Linux-PAM-1.1.1/configure.in
+@@ -360,6 +360,10 @@ AC_SUBST(LIBAUDIT)
+ AC_CHECK_HEADERS(xcrypt.h crypt.h)
++AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
++  [crypt_libs="xcrypt crypt"],
++  [crypt_libs="crypt"])
++
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_rn)
+ LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch b/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
new file mode 100644
index 000000000000..f842da7dfe5e
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
@@ -0,0 +1,21 @@
+Index: Linux-PAM-1.1.1/configure.in
+===================================================================
+--- Linux-PAM-1.1.1.orig/configure.in
++++ Linux-PAM-1.1.1/configure.in
+@@ -361,10 +361,14 @@ AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
+ 	       [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
+ 
+ AC_CHECK_HEADERS(xcrypt.h crypt.h)
++AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
++  [crypt_libs="xcrypt crypt"],
++  [crypt_libs="crypt"])
++
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
+-Libs=$BACKUP_LIBS
++LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
+ if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
+ 	AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])
diff --git a/sys-libs/pam/pam-1.0.4.ebuild b/sys-libs/pam/pam-1.0.4.ebuild
deleted file mode 100644
index 96b729dda931..000000000000
--- a/sys-libs/pam/pam-1.0.4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.4.ebuild,v 1.13 2010/01/06 15:51:10 ulm Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
-
-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/library/${MY_P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	test? ( elibc_glibc? ( >=sys-libs/glibc-2.4 ) )
-	nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no longer supported, and since version"
-		eerror "0.99 is no longer 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:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|timestamp|console)'; 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_timestamp, pam_console"
-		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."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-		ebeep 10
-
-		retval=1
-	fi
-
-	# Produce the warnings only during upgrade, for the following two
-	has_version '<sys-libs/pam-0.99' || return $retval
-
-	# 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_userdb pam_radius; do
-		if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | 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
-}
-
-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.7.0-disable-regenerate-man.patch"
-	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
-	# Remove NIS dependencies, see bug #235431
-	epatch "${FILESDIR}/${MY_PN}-1.0.2-noyp.patch"
-
-	# Fix tests on systems where sizeof(void*) != 8
-	epatch "${FILESDIR}/${MY_PN}-1.0.4-fix-tests.patch"
-
-	# Remove libtool-2 libtool macros, see bug 261167
-	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	# KEEP COMMENTED OUT! It seems like it fails to build with USE=debug!
-	# Do _not_ move this to $(use_enable) without checking if the
-	# configure.in has been fixed. As of 2009/03/03 it's still broken
-	# on upstream's CVS, and --disable-debug means --enable-debug too.
-	# if use debug; then
-	# 	myconf="${myconf} --enable-debug"
-	# fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable cracklib) \
-		$(use_enable audit) \
-		--disable-db \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		--disable-regenerate-man \
-		${myconf} || die "econf failed"
-	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		 sepermitlockdir="/var/run/sepermit" || 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
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
-	docinto modules ; dodoc doc/txts/README.*
-
-	# Remove the wrongly installed manpages
-	rm "${D}"/usr/share/man/man8/pam_userdb.8*
-	use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
-
-	# Get rid of the .la files. We certainly don't need them for PAM
-	# modules, and libpam is installed as a shared object only, so we
-	# don't ned them for static linking either.
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
index 542d5d99db9a..43aa070ba67b 100644
--- a/sys-libs/pam/pam-1.1.0.ebuild
+++ b/sys-libs/pam/pam-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.14 2010/01/24 18:27:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.15 2010/04/26 12:04:09 flameeyes Exp $
 
 inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
 
@@ -93,6 +93,10 @@ src_unpack() {
 	# Fix building with nls USE flag disabled
 	epatch "${FILESDIR}/${MY_PN}-1.1.0-nonls.patch"
 
+	# make it possible to skip libxcrypt detection if header is not
+	# found
+	epatch "${FILESDIR}/${MY_PN}-1.1.0-xcrypt.patch"
+
 	# Remove libtool-2 libtool macros, see bug 261167
 	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
 
@@ -108,6 +112,11 @@ src_compile() {
 		myconf="${myconf} --disable-pie"
 	fi
 
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+	export ac_cv_header_xcrypt_h=no
+
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
diff --git a/sys-libs/pam/pam-1.1.1-r1.ebuild b/sys-libs/pam/pam-1.1.1-r1.ebuild
deleted file mode 100644
index 275631b254b3..000000000000
--- a/sys-libs/pam/pam-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r1.ebuild,v 1.1 2010/03/10 16:04:07 flameeyes Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic db-use
-
-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/library/${MY_P}.tar.bz2
-	mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	berkdb? ( sys-libs/db )
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
-RDEPEND="${RDEPEND}
-	!sys-auth/pam_userdb"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no longer supported, and since version"
-		eerror "0.99 is no longer 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:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; 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_console"
-		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."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-		ebeep 10
-
-		retval=1
-	fi
-
-	return $retval
-}
-
-pkg_setup() {
-	check_old_modules
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Avoid building xtests during "make all"; note that for what
-	# we're concerned xtests are not even executed, so we should
-	# probably use EXTRA_PROGRAMS.
-	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
-	# Fix building on uClibc; it is added since 1.1.1 but applies to
-	# 1.1.0 as well.
-	epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
-
-	# Fix tests to find Berkeley DB as installed by Gentoo (with a
-	# library suffix but no suffix on the ELF symbols).
-	epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
-
-	# Remove libtool-2 libtool macros, see bug 261167
-	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable cracklib) \
-		$(use_enable audit) \
-		$(use_enable debug) \
-		$(use_enable berkdb db) \
-		--with-db-uniquename=-$(db_findver sys-libs/db) \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		${myconf} || die "econf failed"
-	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		 sepermitlockdir="/var/run/sepermit" || 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
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
-	docinto modules
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	# Get rid of the .la files. We certainly don't need them for PAM
-	# modules, and libpam is installed as a shared object only, so we
-	# don't ned them for static linking either.
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
diff --git a/sys-libs/pam/pam-1.1.1-r2.ebuild b/sys-libs/pam/pam-1.1.1-r2.ebuild
index 370e21cfcc91..4a7195a2e871 100644
--- a/sys-libs/pam/pam-1.1.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.1 2010/04/06 05:39:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.2 2010/04/26 12:04:09 flameeyes Exp $
 
 EAPI="3"
 
@@ -94,6 +94,10 @@ src_prepare() {
 	# library suffix but no suffix on the ELF symbols).
 	epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
 
+	# make it possible to skip libxcrypt detection if header is not
+	# found
+	epatch "${FILESDIR}/${MY_PN}-1.1.1-xcrypt.patch"
+
 	# Remove libtool-2 libtool macros, see bug 261167
 	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
 
@@ -109,6 +113,11 @@ src_configure() {
 		myconf="${myconf} --disable-pie"
 	fi
 
+	# Disable automatic detection of libxcrypt; we _don't_ want the
+	# user to link libxcrypt in by default, since we won't track the
+	# dependency and allow to break PAM this way.
+	export ac_cv_header_xcrypt_h=no
+
 	econf \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
@@ -131,6 +140,11 @@ src_compile() {
 	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
 }
 
+src_test() {
+	# explicitly allow parallel-build during testing
+	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" check || die "emake check failed"
+}
+
 src_install() {
 	local lib
 
diff --git a/sys-libs/pam/pam-1.1.1.ebuild b/sys-libs/pam/pam-1.1.1.ebuild
deleted file mode 100644
index 70f2f8be961a..000000000000
--- a/sys-libs/pam/pam-1.1.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1.ebuild,v 1.3 2010/01/06 15:51:10 ulm Exp $
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
-
-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/library/${MY_P}.tar.bz2
-	mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no longer supported, and since version"
-		eerror "0.99 is no longer 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:#.*::' "${ROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; 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_console"
-		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."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-		ebeep 10
-
-		retval=1
-	fi
-
-	return $retval
-}
-
-pkg_setup() {
-	check_old_modules
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Avoid building xtests during "make all"; note that for what
-	# we're concerned xtests are not even executed, so we should
-	# probably use EXTRA_PROGRAMS.
-	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
-
-	# Fix building on uClibc; it is added since 1.1.1 but applies to
-	# 1.1.0 as well.
-	epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
-
-	# Remove libtool-2 libtool macros, see bug 261167
-	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable cracklib) \
-		$(use_enable audit) \
-		$(use_enable debug) \
-		--disable-db \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		${myconf} || die "econf failed"
-	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		 sepermitlockdir="/var/run/sepermit" || 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
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
-	docinto modules
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	# Remove the wrongly installed manpages
-	rm "${D}"/usr/share/man/man8/pam_userdb.8*
-	use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
-
-	# Get rid of the .la files. We certainly don't need them for PAM
-	# modules, and libpam is installed as a shared object only, so we
-	# don't ned them for static linking either.
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}