Add USE=kerberos,ldap,pam wrt bug #513298. Drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

6 files changed, 19 insertions, 332 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index d4037d1b9665..253c42fede53 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.221 2014/06/14 08:49:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.222 2014/06/15 07:11:40 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-baselibs-20140508-r6.ebuild,
+  -emul-linux-x86-baselibs-20140508-r7.ebuild,
+  -emul-linux-x86-baselibs-20140508-r8.ebuild,
+  emul-linux-x86-baselibs-20140508-r10.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Add USE=kerberos,ldap,pam wrt bug #513298. Drop old.
 
 *emul-linux-x86-baselibs-20140508-r10 (14 Jun 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
index 7eb2e0ccea25..04224773aa5e 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild,v 1.1 2014/06/14 08:49:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r10.ebuild,v 1.2 2014/06/15 07:11:40 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -11,7 +11,7 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 	openssl tcp_wrappers_license"
 
 KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
+IUSE="abi_x86_32 kerberos ldap pam"
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
@@ -80,15 +80,15 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
 		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
 		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
+		kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)] )
 		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
+		ldap? ( >=net-nds/openldap-2.4.38-r2[abi_x86_32(-)] )
 		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
 		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
 		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
 		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
 		>=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)]
-		>=sys-libs/pam-1.1.8-r2[abi_x86_32(-)]
+		pam? ( >=virtual/pam-0-r1[abi_x86_32(-)] )
 		>=net-libs/libsoup-2.46.0-r1[abi_x86_32(-)]
 		>=net-libs/neon-0.30.0-r1[abi_x86_32(-)]
 		>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r6.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r6.ebuild
deleted file mode 100644
index 53a9f8f9bdcf..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r6.ebuild,v 1.1 2014/05/25 11:29:38 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
-		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
-		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
-		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild
deleted file mode 100644
index bfa278c11884..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild,v 1.1 2014/05/29 18:44:15 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
-		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
-		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
-		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
-		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
-		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r8.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r8.ebuild
deleted file mode 100644
index cafc244a9593..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r8.ebuild,v 1.1 2014/05/30 14:37:35 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
-		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
-		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
-		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
-		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
-		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
-		>=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)]
-		>=sys-libs/pam-1.1.8-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild
index 7f5f9715d641..179af654d72d 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild,v 1.1 2014/06/08 12:55:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild,v 1.2 2014/06/15 07:11:40 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -11,7 +11,7 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 	openssl tcp_wrappers_license"
 
 KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
+IUSE="abi_x86_32 kerberos ldap pam"
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
@@ -80,15 +80,15 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
 		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
 		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
+		kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)] )
 		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
+		ldap? ( >=net-nds/openldap-2.4.38-r2[abi_x86_32(-)] )
 		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
 		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
 		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
 		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
 		>=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)]
-		>=sys-libs/pam-1.1.8-r2[abi_x86_32(-)]
+		pam? ( >=virtual/pam-0-r1[abi_x86_32(-)] )
 		>=net-libs/libsoup-2.46.0-r1[abi_x86_32(-)]
 		>=net-libs/neon-0.30.0-r1[abi_x86_32(-)]
 	)