13 files changed, 10 insertions, 751 deletions
diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index bd74b7f93d58..d52ab00afd21 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/nss_ldap
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.56 2008/09/24 19:01:23 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.57 2009/07/28 16:49:56 robbat2 Exp $
+
+  28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  -nss_ldap-239-r1.ebuild, -nss_ldap-249.ebuild, -nss_ldap-250.ebuild,
+  -nss_ldap-250-r1.ebuild, -files/nss_ldap-250-reconnect-timeouts.patch,
+  -nss_ldap-252.ebuild, -nss_ldap-253.ebuild, -nss_ldap-253-r1.ebuild,
+  -nss_ldap-254.ebuild, -nss_ldap-257.ebuild, -nss_ldap-257.2.ebuild:
+  Bug #271701: Trim old versions that were vulnerable to GLSA 200711-33.
 
 *nss_ldap-262 (24 Sep 2008)
 
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 177e0524aff7..4c5c99119341 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,36 +1,17 @@
 AUX nss_ldap-239-tls-security-bug.patch 1022 RMD160 9b48ef4eee157b4b3bfa8a531bbe0000ca564295 SHA1 1e091948682c1f332c618c7d594b4cf3e8f82140 SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4
 AUX nss_ldap-249-sasl-compile.patch 282 RMD160 dcca3b25794db3d5db82ec6b9ed423af829f2de0 SHA1 abb3e6e027a564e981a3a7208e94cc61f89ee301 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6
-AUX nss_ldap-250-reconnect-timeouts.patch 3411 RMD160 31fba595a320903f959b566b46584d50ee84e2fd SHA1 dd93e21606017c35144c1a3f077d65635deea126 SHA256 750736f5756ad9b4ea42f0a6fafc8634126b34736fcf26e1822273a781a6b7ba
 AUX nss_ldap-252-reconnect-timeouts.patch 3169 RMD160 f442c89e3065db02aef6fd60235e20db9baadb16 SHA1 d8f3acd6b118d34223e93991431acf05fcacdc08 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f
 AUX nss_ldap-254-nss_getgrent_skipmembers.patch 7921 RMD160 e9479d357c28e63f24b08fd73023322e8107a632 SHA1 c95b986c02a23a60509ae82c0e4caa155043b8c4 SHA256 4ea143c1c33c771a1868f46a349a71ba2c904a14d8ec23320fa2d500a72c9882
 AUX nss_ldap-257-nss_max_group_depth.patch 3551 RMD160 8d23cd290f23808f14e1e5308280de00fb9cb9f0 SHA1 625edf664eb66bece8bc420f50c95b9ca279ea9d SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37
 AUX nss_ldap-257.2-gssapi-headers.patch 2343 RMD160 b99b79b7cf9a423aceb350bfcc7d692b5bfa4ead SHA1 b7a3577b4db4f1c87c55935c2f6493bc704c82c2 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5
 AUX nsswitch.ldap.diff 575 RMD160 6c429261de3f99eccfb6f613e0d8a499fa798245 SHA1 a2aada398f1db0eb162633d39992646ce513a3b6 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e
-DIST nss_ldap-239.tar.gz 222276 RMD160 525ed402ef5959a2740a7539c309c478a4765381 SHA1 beee30b433a01dccd863e7a0cdb7fe87cefda7fd SHA256 7416e4fb54322c77ada1b3f58b8458bcefce078e91c250ae736b62045cd0f729
-DIST nss_ldap-249.tar.gz 262800 RMD160 d411ab872932707bb38829fa388cf2090ffa4855 SHA1 b7eb78fc97ab7cf7d2ab1ddf529d08ef6f0fb306 SHA256 2733473e2305e48227b4762ba7c14fb0cc6eb717ee2c3165915fb07ece6733e1
-DIST nss_ldap-250.tar.gz 240122 RMD160 52a27c0282d43c0b4e291dceaeeac7fcf43d8ece SHA1 8f53f1f2f0013943631a7439cfecbfa8936ee8de SHA256 555c8fc9585478bc31b25349469685fbb6036cc6895e3761731c2c0e7accf2f0
-DIST nss_ldap-252.tar.gz 228027 RMD160 2748ae6cf76b785bfe5fbab8d650f66d2dd830ef SHA1 a2ac1f394360c1d78f51393f3948cf38c6ef5391 SHA256 ce9dd91ac056c70fd2608dd0b8dad0627bf942c2b24de7e61ac18c50385fac9d
-DIST nss_ldap-253.tar.gz 228278 RMD160 a129985fe6b27a481efa94e07e994cbcdbb6867c SHA1 fb08e794233d4524bcd784fe6d845b0b236a72a2 SHA256 c2caa483d171304f08a7e9a6cad7569ace5bc7f4f297ddd470e940799c6f190c
-DIST nss_ldap-254.tar.gz 228504 RMD160 db8e57be27f0fddca0f285380eb3bd9d7e2a11f9 SHA1 4ef320b99edc0f8fc2e9c3ebf13842490c772c98 SHA256 3bc77bd173b1cbeda8d19a923f3d62ae4ce02c57d5af68b71254fb3896c03730
-DIST nss_ldap-257.2.tar.gz 274699 RMD160 b27f4509335b7eb026e32458689c01072448093f SHA1 e479a52028836d2494a68e3183673cfd1c202c54 SHA256 7850f40208d1d3dd946e0c9388e7420ef07f69855fd2721fd2784f3cdb5b82fb
-DIST nss_ldap-257.tar.gz 229242 RMD160 b7260a768217901c701c52a5f2446894f6dc7aef SHA1 fc57c721bcbab7eaa3ddcf4953141ab03d788fc2 SHA256 22a0e3b0ebffc5d8f252144a422ef5eaef2ad1255aa7c0953691c990a44e267b
 DIST nss_ldap-258.tar.gz 274694 RMD160 ee52775b9612f780908b3c8363ab2b18e7f4ea1c SHA1 50a5128db5a4d894fba35aeb092685605fba578d SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346
 DIST nss_ldap-259.tar.gz 274878 RMD160 95b7fe2a4c28c4d8e86cf7d0d2e61e5e585b5a06 SHA1 0644d06be11b01e45d7a2a153e247b1203704d25 SHA256 8b65a32717f6173911aaea8e89b2c89ccb901f14f1063f5e49b5ab77d45f1790
 DIST nss_ldap-261.tar.gz 276065 RMD160 abf3f7d100f9d2ede62397538c1fd472855ec587 SHA1 85058bfca645f88a177bcde7fb3f1bea23c6e8f1 SHA256 7e9a6e8e1f07607b63f5f61fda755778fb1257e6599ac467327b6e817de5aad7
 DIST nss_ldap-262.tar.gz 274927 RMD160 db3419cf987a74bf00a84cec6c8651f3ea433dd0 SHA1 846419cc10fbcccc173744176bdd88f9607e7f28 SHA256 179cd8458ae3cc23cb726cf15afb94089482dd22559ac503e7df5fd6fc2c4cbf
-EBUILD nss_ldap-239-r1.ebuild 1344 RMD160 072c5afe01d93c4e89dea9434e6cb4725444de70 SHA1 7ebd221362f33881debde95614d0d608f3aa8104 SHA256 bab782405e7699ed20d73e0cf19afc036659a60591b5cd2f7e74fdb2a3f42c32
-EBUILD nss_ldap-249.ebuild 1392 RMD160 6bc1684471a7aebbebba5e7f953c753659fee72d SHA1 36ccef393dfffad97ebc0a31cdfd6fc2992fab2b SHA256 1396ef5841cd22093d633b66d8b4849c913c7805d8bba7479490f77375bf43fb
-EBUILD nss_ldap-250-r1.ebuild 1654 RMD160 34c7ee9fb2fdb50ab0d6ad44b179852a10a52b86 SHA1 8afa59cb709a362ae30ac10f4f46e519948529a5 SHA256 55143af53ded71b25fa48f97367b3ed3c2222a7f988b93506cd715b735657e47
-EBUILD nss_ldap-250.ebuild 1594 RMD160 df0a6636f64e5e7db97a488882feebaac873ad74 SHA1 bc0d32de459f4be1372c4ff4f96cfba12f0aa2e1 SHA256 359be73c74b76ef00eb9ba4dc728862b5a351e3b392a30da4c511dff7baddbc0
-EBUILD nss_ldap-252.ebuild 1827 RMD160 f6374ff7c14fa4144af793f7d3b0522fdead74f4 SHA1 72dfda34ca9f4acafd80efe407256b79af709a83 SHA256 6dcb5df7f239625034a88c33a44dc23615f391ae086292bf6b5917de70670adf
-EBUILD nss_ldap-253-r1.ebuild 1944 RMD160 e50ae30c6712f8001704286bf6ae5a2569a1926d SHA1 99da126940f60b3f5a65371d51a1f8956046b5a7 SHA256 e36dd29340c187ec3c5faf1c1e25cdb72feab4b73270f4c300debd443984c54c
-EBUILD nss_ldap-253.ebuild 1821 RMD160 47de05bc9f34ff03234bba7f32ff9abc7c9ce840 SHA1 4b48d3b8b7664bc1be77208de54f6bef059d05ff SHA256 6bc3ca75326bd0a376657699f1bb3af78c19367af134edfe5f2a841e4b83ede7
-EBUILD nss_ldap-254.ebuild 2030 RMD160 6530c786a79e96399bf26f13cb256a384ae80afc SHA1 514ae2da260eaf01aac53a4db54d426df327f53a SHA256 3959144611d0b462ba31d848870fe3681aba4787e634daab49a41413286a07c1
-EBUILD nss_ldap-257.2.ebuild 2170 RMD160 d0e088571e5fc6839dd705d84eeb3cc2007b9e31 SHA1 afbc5303cd778e1a8bb4e831ae0ab3f279902771 SHA256 a53dc67426b4b291f08417e291b59ade3790dcd5dbb7fce706839549e32f7c36
-EBUILD nss_ldap-257.ebuild 2138 RMD160 533377fb60031b31dc04d701e87dee1b322feab0 SHA1 1087a6d6a4b58af90ad74e8f13b8e6a4e539a965 SHA256 c5e0fd06bbdaf705c4dafdf97f6eed0dea52ed460724fdf6c47ead3ab474188f
 EBUILD nss_ldap-258.ebuild 2372 RMD160 a4869b6d13e033eb35b26dfdcf2cdb71edf35826 SHA1 169f695b92bbd02500f76c117f75007e5c6e4ab8 SHA256 91491630930b3b752c40659937dcce431b315f39253812d8443c971ed8ae00a7
 EBUILD nss_ldap-259.ebuild 2379 RMD160 3df6c70a17527bf60a545915c149f68bbd66724d SHA1 72e3c24e7ba468dc33f70cfcc1e6d1b9eff3fd02 SHA256 53cf4f8aabc230fb3a948d905ae4c51f6f65aabdf12e6042064853a4c3f3f620
 EBUILD nss_ldap-261.ebuild 2499 RMD160 139eeb95880f741e493b019eeb6a6ece367f5e2b SHA1 fd7bbf290da758f396d9c0853f4ee60d6648a054 SHA256 1cd3978bcf73de9da6175f39d6f2f272f0d6259037e7edd97e7604cb2b411d8b
 EBUILD nss_ldap-262.ebuild 2499 RMD160 a3bb810de2c68961ab6120d2870104687b36e61a SHA1 8dda9cd9d3635ea89d2fb07bf08cc6c5fe0308d8 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29
-MISC ChangeLog 14911 RMD160 766eab12a3a3e433885c9453d78c0c10e7d76b6d SHA1 c9b9329aa86e8eb3e2c04dd301605c3fae88baf6 SHA256 1839376c07796b6789f653e7b98269b6d6a387f437a3a98500dec5d12198837f
+MISC ChangeLog 15323 RMD160 eb6fb85f4c7da5258e4011c4039cbef4cf84eb06 SHA1 a2cce277fa202d211271e1d8eb7c2d9772cd67bd SHA256 85eeebcd0ef850211a236bcd17f1a90e1d116eec1a574ff0983fa3b57ed66730
 MISC metadata.xml 374 RMD160 d093200b154cb3766f818bb06ab05fb29d45af0c SHA1 0e6b6cc539b9c537d3a5464884ca2ca9c1717134 SHA256 72f6eb7d9ee256d2edb0336e03b71674bf17d2828222ca8722fdb48a88304365
diff --git a/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch b/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch
deleted file mode 100644
index dc8a37a916ed..000000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-This patch changes the default timeouts, so that they are much lower, and do
-not cause major delays when booting a system. This is a workaround until the
-core /etc/{passwd,group} contain all of the data needed for a system boot.
-
-Also add a note that 'ssl on' is broken and TLS should be used instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap-nss.h nss_ldap-250/ldap-nss.h
---- nss_ldap-250.orig/ldap-nss.h	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap-nss.h	2006-06-14 01:58:01.933005492 -0700
-@@ -96,9 +96,9 @@
-  * unacceptable, in which case you may wish to adjust
-  * the constants below.
-  */
--#define LDAP_NSS_TRIES           5	/* number of sleeping reconnect attempts */
--#define LDAP_NSS_SLEEPTIME       4	/* seconds to sleep; doubled until max */
--#define LDAP_NSS_MAXSLEEPTIME    64	/* maximum seconds to sleep */
-+#define LDAP_NSS_TRIES           4	/* number of sleeping reconnect attempts */
-+#define LDAP_NSS_SLEEPTIME       1	/* seconds to sleep; doubled until max */
-+#define LDAP_NSS_MAXSLEEPTIME    16	/* maximum seconds to sleep */
- #define LDAP_NSS_MAXCONNTRIES    2	/* reconnect attempts before sleeping */
- 
- #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap.conf nss_ldap-250/ldap.conf
---- nss_ldap-250.orig/ldap.conf	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap.conf	2006-06-14 02:12:02.008444745 -0700
-@@ -1,4 +1,4 @@
-- @(#)$Id: ldap.conf,v 2.46 2006/04/13 03:25:56 lukeh Exp $
-+# @(#)$Id: ldap.conf,v 2.46 2006/04/13 03:25:56 lukeh Exp $
- #
- # This is the configuration file for the LDAP nameservice
- # switch library and the LDAP PAM module.
-@@ -283,7 +283,8 @@
- # OpenLDAP SSL mechanism
- # start_tls mechanism uses the normal LDAP port, LDAPS typically 636
- #ssl start_tls
--#ssl on
-+###ssl on
-+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead.
- 
- # OpenLDAP SSL options
- # Require and verify server certificate (yes/no)
-@@ -315,3 +316,27 @@
- # Override the default Kerberos ticket cache location.
- #krb5_ccname FILE:/etc/.ldapcache
- 
-+# Timeout behavior
-+# Upstream nss_ldap hard-codes these values:
-+#nss_reconnect_tries 5			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 4		# initial sleep value
-+#nss_reconnect_maxsleeptime 64	# max sleep value to cap at
-+#nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
-+# server is not available.
-+
-+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
-+# (The hardwired constants in the code are changed to them as well):
-+nss_reconnect_tries 4			# number of times to double the sleep time
-+nss_reconnect_sleeptime 1		# initial sleep value
-+nss_reconnect_maxsleeptime 16	# max sleep value to cap at
-+nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 15 seconds (1+2+4+8=15)
-+
-+# If you are impatient, and know your LDAP server is reliable, fast or local,
-+# you may wish to use these values instead:
-+#nss_reconnect_tries 1			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 1		# initial sleep value
-+#nss_reconnect_maxsleeptime 1	# max sleep value to cap at
-+#nss_reconnect_maxconntries 3	# how many tries before sleeping
-+# This leads to a delay of 1 second.
diff --git a/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild
deleted file mode 100644
index dcc26c5fbf7f..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild,v 1.13 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-249.ebuild b/sys-auth/nss_ldap/nss_ldap-249.ebuild
deleted file mode 100644
index c7bd6c1458fd..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-249.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-249.ebuild,v 1.8 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 hppa mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild
deleted file mode 100644
index e09c222a81d3..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild,v 1.3 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	epatch "${FILESDIR}"/${PN}-250-reconnect-timeouts.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-250.ebuild b/sys-auth/nss_ldap/nss_ldap-250.ebuild
deleted file mode 100644
index e402abc6e5e5..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-250.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-250.ebuild,v 1.4 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-252.ebuild b/sys-auth/nss_ldap/nss_ldap-252.ebuild
deleted file mode 100644
index d88c04e486a6..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-252.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-252.ebuild,v 1.3 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild
deleted file mode 100644
index 854d0afae462..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-253.ebuild b/sys-auth/nss_ldap/nss_ldap-253.ebuild
deleted file mode 100644
index 1aabc00ccd59..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-253.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-253.ebuild,v 1.10 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-254.ebuild b/sys-auth/nss_ldap/nss_ldap-254.ebuild
deleted file mode 100644
index d8f024b19912..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-254.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-254.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-257.2.ebuild b/sys-auth/nss_ldap/nss_ldap-257.2.ebuild
deleted file mode 100644
index 2c43d1f28d6b..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-257.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-257.2.ebuild,v 1.2 2007/11/07 17:51:34 armin76 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-257.ebuild b/sys-auth/nss_ldap/nss_ldap-257.ebuild
deleted file mode 100644
index c2fbd68a83f0..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-257.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-257.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}