arm stable wrt bug #154349 and security cleanup

(Portage version: 2.1.2_rc3-r7) (Signed Manifest commit)
author: Markus Ullmann <jokey@gentoo.org> 2006-12-23 16:11:23 +0000
committer: Markus Ullmann <jokey@gentoo.org> 2006-12-23 16:11:23 +0000
commit: 1b467460acca371f55034fd7f753848b6c1fd9f2 (patch)
tree: 9cefef06bf913eeeb7a8f461ff6bbe3aa15a3814 /net-nds/openldap
parent: arm stable wrt bug #154349 and security cleanup (diff)
download: gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.tar.gz
gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.tar.bz2
gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.zip
19 files changed, 19 insertions, 4211 deletions
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 2f8e0cc9dd21..a0d007c82daf 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -123,34 +123,18 @@ DIST openldap-2.3.24.tgz 3756405 RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06
 DIST openldap-2.3.27.tgz 3757519 RMD160 8c25c39689daa515f14e88611490ae6d8df0911c SHA1 c2b6ac3ec89d0f58d079592946d045dba45edafe SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7
 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
 DIST openldap-2.3.31.tgz 3766559 RMD160 3a5bc3622d64c7af27901046144bc9e2952abf57 SHA1 4ee3cefdb82aaabb42fe25f791e8a0f48b046a16 SHA256 0b43259bc738f207f2bcd3adea6e819cdeab0fd92ba5992153dbe41563c56eb2
-EBUILD openldap-2.1.30-r6.ebuild 8172 RMD160 6eba4d1aabee219a8ec0460fb10243c1b8a72abc SHA1 3ae926b0b77950f9c6db61e8e64ee15dd22c515a SHA256 6084804273d3d263139d0c350b704fa4b08a1b454b477eb3c6b87f96031dbe9a
-MD5 1ab8461ac43c61a1ac1ea1e2855023ab openldap-2.1.30-r6.ebuild 8172
-RMD160 6eba4d1aabee219a8ec0460fb10243c1b8a72abc openldap-2.1.30-r6.ebuild 8172
-SHA256 6084804273d3d263139d0c350b704fa4b08a1b454b477eb3c6b87f96031dbe9a openldap-2.1.30-r6.ebuild 8172
-EBUILD openldap-2.1.30-r7.ebuild 8932 RMD160 cef414707aea66c2b9161020087e2b1fbca31377 SHA1 e27590bead0190eacdacbe0798bc53ac1d2ddbe6 SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e
-MD5 7e336278947df5aac46b8bbff0eb29b8 openldap-2.1.30-r7.ebuild 8932
-RMD160 cef414707aea66c2b9161020087e2b1fbca31377 openldap-2.1.30-r7.ebuild 8932
-SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e openldap-2.1.30-r7.ebuild 8932
-EBUILD openldap-2.1.30-r8.ebuild 8278 RMD160 3204eecb2a544259bf9cf752233515b14a20e02d SHA1 69b9f3f415601686b8d8314f8af6599f572116c6 SHA256 46aaa1df283e8ca9290637e73d6ca21ec41440ee1fdcb2415e5e7567dd6e6091
-MD5 91ec1e3ca788d82de8faecee83a449cf openldap-2.1.30-r8.ebuild 8278
-RMD160 3204eecb2a544259bf9cf752233515b14a20e02d openldap-2.1.30-r8.ebuild 8278
-SHA256 46aaa1df283e8ca9290637e73d6ca21ec41440ee1fdcb2415e5e7567dd6e6091 openldap-2.1.30-r8.ebuild 8278
+EBUILD openldap-2.1.30-r8.ebuild 8278 RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae SHA1 fb357ac09cf4a83be7f06c7b1ddbf9981e7bd26b SHA256 f43bd32d81fa68f1d033655bdfd4ebdb1e2e65acc663dc9c4f66085553e3efea
+MD5 b6cef48c62a0322e3e7a8433225f5cad openldap-2.1.30-r8.ebuild 8278
+RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae openldap-2.1.30-r8.ebuild 8278
+SHA256 f43bd32d81fa68f1d033655bdfd4ebdb1e2e65acc663dc9c4f66085553e3efea openldap-2.1.30-r8.ebuild 8278
 EBUILD openldap-2.1.30-r9.ebuild 9044 RMD160 df07f5f73d2889a22d6f6f5093023a1afa9ec2aa SHA1 b65afd79b9fe96ed8d377a741e3d2ed0573477d1 SHA256 261b9625a036e04b16c4e311dc32ea65b1d97e94f6663be09f4a9213f5c7b4c8
 MD5 d613df3636750dd3df690ea2ab76e945 openldap-2.1.30-r9.ebuild 9044
 RMD160 df07f5f73d2889a22d6f6f5093023a1afa9ec2aa openldap-2.1.30-r9.ebuild 9044
 SHA256 261b9625a036e04b16c4e311dc32ea65b1d97e94f6663be09f4a9213f5c7b4c8 openldap-2.1.30-r9.ebuild 9044
-EBUILD openldap-2.2.28-r3.ebuild 13759 RMD160 45424c3b76cd0071c45afcd13d6cde0f19844b25 SHA1 097980f1f29cbb8eec2d657a5074e99759f75261 SHA256 10bf91774089fd4552d7dbaa108b6aaa290e3a49fb72a2290fcf555859f6e596
-MD5 6d7a94de921228452b007a3052055528 openldap-2.2.28-r3.ebuild 13759
-RMD160 45424c3b76cd0071c45afcd13d6cde0f19844b25 openldap-2.2.28-r3.ebuild 13759
-SHA256 10bf91774089fd4552d7dbaa108b6aaa290e3a49fb72a2290fcf555859f6e596 openldap-2.2.28-r3.ebuild 13759
-EBUILD openldap-2.2.28-r4.ebuild 15070 RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 SHA1 e8d13d78741ceeee5ef0d068789b40d4ac992b4b SHA256 3acdadb055a0a3128e347a4026aea869abed1151389f646e55af516dc3d5fdaa
-MD5 b4774b3a30167a67b0b6f69fabfa4c33 openldap-2.2.28-r4.ebuild 15070
-RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 openldap-2.2.28-r4.ebuild 15070
-SHA256 3acdadb055a0a3128e347a4026aea869abed1151389f646e55af516dc3d5fdaa openldap-2.2.28-r4.ebuild 15070
-EBUILD openldap-2.2.28-r5.ebuild 13872 RMD160 96f7668d910957f2fb5de6e0cf038c6027ec0771 SHA1 1b019ec676a92ef7c95efaf7bd6424cb6fa2ed06 SHA256 db2809c2f69925f9dd97b1a3e7cac6ba984214ca868440cca077d0bcb712499f
-MD5 019f834b4534647f51bc3cc62b2c9cfe openldap-2.2.28-r5.ebuild 13872
-RMD160 96f7668d910957f2fb5de6e0cf038c6027ec0771 openldap-2.2.28-r5.ebuild 13872
-SHA256 db2809c2f69925f9dd97b1a3e7cac6ba984214ca868440cca077d0bcb712499f openldap-2.2.28-r5.ebuild 13872
+EBUILD openldap-2.2.28-r5.ebuild 13871 RMD160 ff44f43532ff6cf0d6436d560adb7d055d9d2eee SHA1 edbd63ccb6218aeb62b125e4d04d25f670446e24 SHA256 8aba892d3f122cf9bae8db85c81ff4921407c2346a9e0f6b541e5d8e9b378c1e
+MD5 5ddf5bf7bd6c0e7e0142b38d7279362e openldap-2.2.28-r5.ebuild 13871
+RMD160 ff44f43532ff6cf0d6436d560adb7d055d9d2eee openldap-2.2.28-r5.ebuild 13871
+SHA256 8aba892d3f122cf9bae8db85c81ff4921407c2346a9e0f6b541e5d8e9b378c1e openldap-2.2.28-r5.ebuild 13871
 EBUILD openldap-2.2.28-r6.ebuild 15182 RMD160 6c89460e2bbdd2b103b75b35fa5a330f7eacfcc8 SHA1 af995cefb935a943d1aeeb5e42e7f89caaaa714a SHA256 accfbb8bff6545b52437d290700c5f52fc949ad527daaacee37e30b6f9ea36f5
 MD5 128c38b707eebe22b9a18f83a48eb21c openldap-2.2.28-r6.ebuild 15182
 RMD160 6c89460e2bbdd2b103b75b35fa5a330f7eacfcc8 openldap-2.2.28-r6.ebuild 15182
@@ -159,64 +143,32 @@ EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9
 MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268
 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268
 SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42 openldap-2.3.24-r1.ebuild 14268
-EBUILD openldap-2.3.24-r2.ebuild 17364 RMD160 62374cf13e0488bf9ac8c857e8deed9a453f03e4 SHA1 3ae7484b776db871361a2d4701faa4bb604d568c SHA256 accc11ed39b2f49b0ef3184a325f1879ea7e366c5efbbe4b7d8c8340f4be2538
-MD5 82590326ec4db330ee1449d8a66367c3 openldap-2.3.24-r2.ebuild 17364
-RMD160 62374cf13e0488bf9ac8c857e8deed9a453f03e4 openldap-2.3.24-r2.ebuild 17364
-SHA256 accc11ed39b2f49b0ef3184a325f1879ea7e366c5efbbe4b7d8c8340f4be2538 openldap-2.3.24-r2.ebuild 17364
-EBUILD openldap-2.3.27-r1.ebuild 17782 RMD160 f4dd0f54ada98666a664f86360de2d31ec93ecf6 SHA1 c5b6269aa28bbc94a5d36bd9bd6ea63842e8ca4a SHA256 0c5170b74cb81479acc12032cf70f4f74056c43361ba4185eb19abef7dca7452
-MD5 c0a58f4a4b8b94fa860f57cfc75d60f0 openldap-2.3.27-r1.ebuild 17782
-RMD160 f4dd0f54ada98666a664f86360de2d31ec93ecf6 openldap-2.3.27-r1.ebuild 17782
-SHA256 0c5170b74cb81479acc12032cf70f4f74056c43361ba4185eb19abef7dca7452 openldap-2.3.27-r1.ebuild 17782
-EBUILD openldap-2.3.27-r2.ebuild 17748 RMD160 bbf6fd8b11b1f5bfabb92708fa691ae6d3d7ef08 SHA1 0b10d9f11b89319da8c5f4446bd9def7561b04a7 SHA256 218abbd2adee5838c72a7488af8335e9fd18f8e8278d58876c7132e7cbfd5c00
-MD5 09b76d174fad339d6ba0ec0ae193eaad openldap-2.3.27-r2.ebuild 17748
-RMD160 bbf6fd8b11b1f5bfabb92708fa691ae6d3d7ef08 openldap-2.3.27-r2.ebuild 17748
-SHA256 218abbd2adee5838c72a7488af8335e9fd18f8e8278d58876c7132e7cbfd5c00 openldap-2.3.27-r2.ebuild 17748
-EBUILD openldap-2.3.27-r3.ebuild 17913 RMD160 cfe2f805eefcbd3b1b220e0d4aef3476b3c4a8ea SHA1 f262aa7fa98c5d504976a6e8d26d9689d6ac999a SHA256 918450d71a04c39875ce2c6a6a994a64f14cd673c790ccf97ab5d012ce26f69a
-MD5 b8caec1f94df6fb64ccad10eb19eefbd openldap-2.3.27-r3.ebuild 17913
-RMD160 cfe2f805eefcbd3b1b220e0d4aef3476b3c4a8ea openldap-2.3.27-r3.ebuild 17913
-SHA256 918450d71a04c39875ce2c6a6a994a64f14cd673c790ccf97ab5d012ce26f69a openldap-2.3.27-r3.ebuild 17913
-EBUILD openldap-2.3.27.ebuild 17369 RMD160 859df9b9b8573504279e6ef77e3a2d22f3c9878f SHA1 12fcf326e2104aaa3668cb4eff99600a5999f9b0 SHA256 2f562d8dc4e20f8717361e1c50190038e8226ce7652f33857a82bc724e0ec67a
-MD5 73b37e4d08c002487a4bafa2722492ca openldap-2.3.27.ebuild 17369
-RMD160 859df9b9b8573504279e6ef77e3a2d22f3c9878f openldap-2.3.27.ebuild 17369
-SHA256 2f562d8dc4e20f8717361e1c50190038e8226ce7652f33857a82bc724e0ec67a openldap-2.3.27.ebuild 17369
+EBUILD openldap-2.3.27-r3.ebuild 17913 RMD160 4ef009d1299514bdda6667694e176632f084f51a SHA1 793d6fe1bf3f185cff1bfd40157e02231733cc73 SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2
+MD5 e85cfe3479b0b0f669d58e42c3887d99 openldap-2.3.27-r3.ebuild 17913
+RMD160 4ef009d1299514bdda6667694e176632f084f51a openldap-2.3.27-r3.ebuild 17913
+SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2 openldap-2.3.27-r3.ebuild 17913
 EBUILD openldap-2.3.30-r1.ebuild 17803 RMD160 8a86b9e9a26080461f20d243bde9b86725e0d883 SHA1 a374927a74ce0c7a3e565d7f54f6fa7f76728e22 SHA256 b238e671cf3120dfff6af55dda43e277d09734fc4c36c62b6dda22ab33076187
 MD5 c20bf96b591beccba8b9629a1e4baf83 openldap-2.3.30-r1.ebuild 17803
 RMD160 8a86b9e9a26080461f20d243bde9b86725e0d883 openldap-2.3.30-r1.ebuild 17803
 SHA256 b238e671cf3120dfff6af55dda43e277d09734fc4c36c62b6dda22ab33076187 openldap-2.3.30-r1.ebuild 17803
-EBUILD openldap-2.3.30.ebuild 17811 RMD160 7129a0dd1f3ea4961a7b38cba3f8e08447c3e0e9 SHA1 4fc67380267e834a0be5260dc78238578616b8f8 SHA256 ec1e74f4c38d8346603d8f29a725f222741c969f9eccc199a3464648c8746c03
-MD5 931faa564721c6291dd0fe62226e4a22 openldap-2.3.30.ebuild 17811
-RMD160 7129a0dd1f3ea4961a7b38cba3f8e08447c3e0e9 openldap-2.3.30.ebuild 17811
-SHA256 ec1e74f4c38d8346603d8f29a725f222741c969f9eccc199a3464648c8746c03 openldap-2.3.30.ebuild 17811
 EBUILD openldap-2.3.31.ebuild 17797 RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 SHA1 32218b1372bf93a4661f42b6e6ac9fa7ea0117bf SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d
 MD5 392e2d19cb2aba4e1e53948a15ced714 openldap-2.3.31.ebuild 17797
 RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 openldap-2.3.31.ebuild 17797
 SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d openldap-2.3.31.ebuild 17797
-MISC ChangeLog 40351 RMD160 d3ee2dfe1d231fdf50164af1c2d67bc0ab756e82 SHA1 eb8fadf2047b91477bf3f85c839ba3d5ede36944 SHA256 48e008946a74ba22a9070d2dd15b1ac93b5269afa806c6a09ae5d537a54149d7
-MD5 19d21cf7b3596e0b8a15dd01d75d7252 ChangeLog 40351
-RMD160 d3ee2dfe1d231fdf50164af1c2d67bc0ab756e82 ChangeLog 40351
-SHA256 48e008946a74ba22a9070d2dd15b1ac93b5269afa806c6a09ae5d537a54149d7 ChangeLog 40351
+MISC ChangeLog 40790 RMD160 66fdb6e2ea3b2ca3979165665afa21175a498c51 SHA1 aa4b8887e0c21092ee379778c539ecea7abac491 SHA256 cd3ddab2a7b8adf56d5fc4849394890b5720b52e359b2e53d886ce51cd705fde
+MD5 83c7f173282228333d63a946cdb2cb47 ChangeLog 40790
+RMD160 66fdb6e2ea3b2ca3979165665afa21175a498c51 ChangeLog 40790
+SHA256 cd3ddab2a7b8adf56d5fc4849394890b5720b52e359b2e53d886ce51cd705fde ChangeLog 40790
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 metadata.xml 240
-MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r6 241
-RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r6 241
-SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r6 241
-MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r7 241
-RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r7 241
-SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r7 241
 MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r8 241
 RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r8 241
 SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r8 241
 MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r9 241
 RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r9 241
 SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r9 241
-MD5 7e4e22b26b4b86007460dcf3252bc08c files/digest-openldap-2.2.28-r3 482
-RMD160 f24d179480f1f0d0b0138beb7675e2d99dcb2419 files/digest-openldap-2.2.28-r3 482
-SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/digest-openldap-2.2.28-r3 482
-MD5 7e4e22b26b4b86007460dcf3252bc08c files/digest-openldap-2.2.28-r4 482
-RMD160 f24d179480f1f0d0b0138beb7675e2d99dcb2419 files/digest-openldap-2.2.28-r4 482
-SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/digest-openldap-2.2.28-r4 482
 MD5 7e4e22b26b4b86007460dcf3252bc08c files/digest-openldap-2.2.28-r5 482
 RMD160 f24d179480f1f0d0b0138beb7675e2d99dcb2419 files/digest-openldap-2.2.28-r5 482
 SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/digest-openldap-2.2.28-r5 482
@@ -226,24 +178,9 @@ SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/di
 MD5 90715e5ebf5339aaaa881c3ed3b46b3c files/digest-openldap-2.3.24-r1 241
 RMD160 13c05b3ac61d04c0b78a7788823a866477e2eb16 files/digest-openldap-2.3.24-r1 241
 SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/digest-openldap-2.3.24-r1 241
-MD5 90715e5ebf5339aaaa881c3ed3b46b3c files/digest-openldap-2.3.24-r2 241
-RMD160 13c05b3ac61d04c0b78a7788823a866477e2eb16 files/digest-openldap-2.3.24-r2 241
-SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/digest-openldap-2.3.24-r2 241
-MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27 241
-RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27 241
-SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27 241
-MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27-r1 241
-RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27-r1 241
-SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27-r1 241
-MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27-r2 241
-RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27-r2 241
-SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27-r2 241
 MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27-r3 241
 RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27-r3 241
 SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27-r3 241
-MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30 241
-RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30 241
-SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30 241
 MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30-r1 241
 RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30-r1 241
 SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30-r1 241
@@ -253,7 +190,7 @@ SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFjUTqz974XjDVpbkRAs0gAKDWUUXCwuEB9z7j9ZZE7EOmuPoV+QCdEeWO
-UiUGL4SNDvQKpDWYSZjiEgQ=
-=NlBq
+iD8DBQFFjVUkz974XjDVpbkRAoe9AJ9zfWk5anoMSfxek3fGJzEwr7IYmwCgi1A9
+0lsnYI8+4wtyxDooZA4bL9k=
+=RW7M
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/digest-openldap-2.1.30-r6 b/net-nds/openldap/files/digest-openldap-2.1.30-r6
deleted file mode 100644
index afc64cb183fd..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.1.30-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
-RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673
-SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673
diff --git a/net-nds/openldap/files/digest-openldap-2.1.30-r7 b/net-nds/openldap/files/digest-openldap-2.1.30-r7
deleted file mode 100644
index afc64cb183fd..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.1.30-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
-RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673
-SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673
diff --git a/net-nds/openldap/files/digest-openldap-2.2.28-r3 b/net-nds/openldap/files/digest-openldap-2.2.28-r3
deleted file mode 100644
index 7f47e31dd5fd..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.2.28-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
-RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673
-SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673
-MD5 b51db7328430b9cbe527696da726f1fb openldap-2.2.28.tgz 2630427
-RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c openldap-2.2.28.tgz 2630427
-SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba openldap-2.2.28.tgz 2630427
diff --git a/net-nds/openldap/files/digest-openldap-2.2.28-r4 b/net-nds/openldap/files/digest-openldap-2.2.28-r4
deleted file mode 100644
index 7f47e31dd5fd..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.2.28-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
-RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673
-SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673
-MD5 b51db7328430b9cbe527696da726f1fb openldap-2.2.28.tgz 2630427
-RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c openldap-2.2.28.tgz 2630427
-SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba openldap-2.2.28.tgz 2630427
diff --git a/net-nds/openldap/files/digest-openldap-2.3.24-r2 b/net-nds/openldap/files/digest-openldap-2.3.24-r2
deleted file mode 100644
index 290cc6696bfd..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.24-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e58de30abc959ec88730123cecdb6d1 openldap-2.3.24.tgz 3756405
-RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06 openldap-2.3.24.tgz 3756405
-SHA256 e5247204dc0a41fa9b14ec1110fd2c179210b2288b27ebdee0a465b9e8e100cf openldap-2.3.24.tgz 3756405
diff --git a/net-nds/openldap/files/digest-openldap-2.3.27 b/net-nds/openldap/files/digest-openldap-2.3.27
deleted file mode 100644
index 3b74e66a0d3f..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.27
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fbae4e9279aaa586adcd9f19b66a5ed openldap-2.3.27.tgz 3757519
-RMD160 8c25c39689daa515f14e88611490ae6d8df0911c openldap-2.3.27.tgz 3757519
-SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7 openldap-2.3.27.tgz 3757519
diff --git a/net-nds/openldap/files/digest-openldap-2.3.27-r1 b/net-nds/openldap/files/digest-openldap-2.3.27-r1
deleted file mode 100644
index 3b74e66a0d3f..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.27-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fbae4e9279aaa586adcd9f19b66a5ed openldap-2.3.27.tgz 3757519
-RMD160 8c25c39689daa515f14e88611490ae6d8df0911c openldap-2.3.27.tgz 3757519
-SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7 openldap-2.3.27.tgz 3757519
diff --git a/net-nds/openldap/files/digest-openldap-2.3.27-r2 b/net-nds/openldap/files/digest-openldap-2.3.27-r2
deleted file mode 100644
index 3b74e66a0d3f..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.27-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fbae4e9279aaa586adcd9f19b66a5ed openldap-2.3.27.tgz 3757519
-RMD160 8c25c39689daa515f14e88611490ae6d8df0911c openldap-2.3.27.tgz 3757519
-SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7 openldap-2.3.27.tgz 3757519
diff --git a/net-nds/openldap/files/digest-openldap-2.3.30 b/net-nds/openldap/files/digest-openldap-2.3.30
deleted file mode 100644
index 4ce553b58af8..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c0f108a94070edbb4915e7e40e1ce9c openldap-2.3.30.tgz 3763533
-RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 openldap-2.3.30.tgz 3763533
-SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b openldap-2.3.30.tgz 3763533
diff --git a/net-nds/openldap/openldap-2.1.30-r6.ebuild b/net-nds/openldap/openldap-2.1.30-r6.ebuild
deleted file mode 100644
index f6c39922a699..000000000000
--- a/net-nds/openldap/openldap-2.1.30-r6.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r6.ebuild,v 1.11 2006/11/22 02:55:18 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd selinux"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-apps/sed-4
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-# if USE=berkdb
-#	pull in sys-libs/db
-# else if USE=gdbm
-#	pull in sys-libs/gdbm
-# else
-#	pull in sys-libs/db
-DEPEND="${DEPEND}
-	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 )
-	!berkdb? (
-		gdbm? ( >=sys-libs/gdbm-1.8.0 )
-		!gdbm? ( >=sys-libs/db-4.1.25_p1-r3 )
-	)"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-openldap )"
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/lib/openldap ldap
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -ie 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# Fix up DB-4.0 linking problem
-	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
-	# stuff).
-	epatch ${FILESDIR}/${PN}-2.1.30-db40.patch
-	epatch ${FILESDIR}/${PN}-2.1.30-tls-activedirectory-hang-fix.patch
-
-	# Security bug #96767
-	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# supersedes old fix for bug #31202
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	# ximian connector 1.4.7 ntlm patch
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.30-ximian_connector.patch
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-	#make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# reconf compat and current for RPATH solve
-	cd ${S}
-	einfo "Running libtoolize on ${S}"
-	libtoolize --copy --force
-	einfo "Running aclocal on ${S}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${S}"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	# enable debugging to syslog
-	use debug && myconf="${myconf} --enable-debug"
-	myconf="${myconf} --enable-syslog"
-
-	# enable slapd/slurpd servers
-	myconf="${myconf} --enable-ldap"
-	myconf="${myconf} --enable-slapd --enable-slurpd"
-
-	myconf="${myconf} `use_enable crypt`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_with readline`"
-	myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers`"
-	myconf="${myconf} `use_enable odbc sql`"
-	myconf="${myconf} `use_enable perl`"
-	myconf="${myconf} `use_enable slp`"
-
-	myconf="${myconf} --enable-ldbm"
-	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley'
-	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm'
-	if use berkdb; then
-		einfo "Using Berkeley DB for local backend"
-		myconf="${myconf} ${myconf_berkdb}"
-	elif use gdbm; then
-		einfo "Using GDBM for local backend"
-		myconf="${myconf} ${myconf_gdbm}"
-	else
-		ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-		ewarn "Berkeley DB for local backend"
-		myconf="${myconf} ${myconf_berkdb}"
-	fi
-
-	# alas, for BSD only
-	#myconf="${myconf} --with-fetch"
-
-	myconf="${myconf} --enable-dynamic --enable-modules"
-	myconf="${myconf} --enable-rewrite --enable-rlookups"
-	myconf="${myconf} --enable-passwd --enable-phonetic"
-	myconf="${myconf} --enable-dnssrv --enable-ldap"
-	myconf="${myconf} --enable-meta --enable-monitor"
-	myconf="${myconf} --enable-null --enable-shell"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	# disabled options
-	# --with-bdb-module=dynamic
-	# --enable-dnsserv --with-dnsserv-module=dynamic
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/lib/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-}
-
-src_test() {
-	einfo "Doing tests"
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/lib/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-		sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-		fowners root:ldap ${f}
-		fperms 0640 ${f}
-	done
-
-	# install our own init scripts
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/2.0/slapd slapd
-	newexe ${FILESDIR}/2.0/slurpd slurpd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/2.0/slapd.conf slapd
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo "An LDAP cert already appears to exist, no creating"
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf
-	chmod 0640 /etc/openldap/slapd.conf
-	chown root:ldap /etc/openldap/slapd.conf.default
-	chmod 0640 /etc/openldap/slapd.conf.default
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	# notes from bug #41297, bug #41039
-	ewarn "If you are upgrading from OpenLDAP 2.0, major changes have occured:"
-	ewarn "- bind_anon_dn is now disabled by default for security"
-	ewarn "  add 'allow bind_anon_dn' to your config for the old behavior."
-	ewarn "- Default schemas have changed, you should slapcat your entire DB to"
-	ewarn "  a file, delete your DB, and then slapadd it again. Alternatively"
-	ewarn "  you can try slapindex which should work in almost all cases. Be"
-	ewarn "  sure to check the permissions on the database files afterwards!"
-	if use ssl; then
-		ewarn "- Self-signed SSL certificates are treated harshly by OpenLDAP 2.1"
-		ewarn "  add 'TLS_REQCERT never' if you want to use them."
-	fi
-}
diff --git a/net-nds/openldap/openldap-2.1.30-r7.ebuild b/net-nds/openldap/openldap-2.1.30-r7.ebuild
deleted file mode 100644
index 86f82fa87c21..000000000000
--- a/net-nds/openldap/openldap-2.1.30-r7.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r7.ebuild,v 1.2 2006/09/11 12:22:39 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd selinux"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-apps/sed-4
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-# if USE=berkdb
-#	pull in sys-libs/db
-# else if USE=gdbm
-#	pull in sys-libs/gdbm
-# else
-#	pull in sys-libs/db
-DEPEND="${DEPEND}
-	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 )
-	!berkdb? (
-		gdbm? ( >=sys-libs/gdbm-1.8.0 )
-		!gdbm? ( >=sys-libs/db-4.1.25_p1-r3 )
-	)"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-openldap )"
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/lib/openldap ldap
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -ie 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# Fix up DB-4.0 linking problem
-	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
-	# stuff).
-	epatch ${FILESDIR}/${PN}-2.1.30-db40.patch
-	epatch ${FILESDIR}/${PN}-2.1.30-tls-activedirectory-hang-fix.patch
-
-	# Security bug #96767
-	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# supersedes old fix for bug #31202
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	# ximian connector 1.4.7 ntlm patch
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.30-ximian_connector.patch
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	#make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-
-	# make tests rpath ready
-	EPATCH_OPTS="-p0 -d ${S}/tests" epatch ${FILESDIR}/${PN}-2.1.30-tests.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
-
-	# reconf compat and current for RPATH solve
-	cd ${S}
-	einfo "Running libtoolize on ${S}"
-	libtoolize --copy --force
-	einfo "Running aclocal on ${S}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${S}"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	# enable debugging to syslog
-	use debug && myconf="${myconf} --enable-debug"
-	myconf="${myconf} --enable-syslog"
-
-	# enable slapd/slurpd servers
-	myconf="${myconf} --enable-ldap"
-	myconf="${myconf} --enable-slapd --enable-slurpd"
-
-	myconf="${myconf} `use_enable crypt`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_with readline`"
-	myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers`"
-	myconf="${myconf} `use_enable odbc sql`"
-	myconf="${myconf} `use_enable perl`"
-	myconf="${myconf} `use_enable slp`"
-
-	myconf="${myconf} --enable-ldbm"
-	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley'
-	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm'
-	if use berkdb; then
-		einfo "Using Berkeley DB for local backend"
-		myconf="${myconf} ${myconf_berkdb}"
-	elif use gdbm; then
-		einfo "Using GDBM for local backend"
-		myconf="${myconf} ${myconf_gdbm}"
-	else
-		ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-		ewarn "Berkeley DB for local backend"
-		myconf="${myconf} ${myconf_berkdb}"
-	fi
-
-	# alas, for BSD only
-	#myconf="${myconf} --with-fetch"
-
-	myconf="${myconf} --enable-dynamic --enable-modules"
-	myconf="${myconf} --enable-rewrite --enable-rlookups"
-	myconf="${myconf} --enable-passwd --enable-phonetic"
-	myconf="${myconf} --enable-dnssrv --enable-ldap"
-	myconf="${myconf} --enable-meta --enable-monitor"
-	myconf="${myconf} --enable-null --enable-shell"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	# disabled options
-	# --with-bdb-module=dynamic
-	# --enable-dnsserv --with-dnsserv-module=dynamic
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/lib/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-}
-
-src_test() {
-	einfo "Doing tests"
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/lib/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-		sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-		fowners root:ldap ${f}
-		fperms 0640 ${f}
-	done
-
-	# install our own init scripts
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/2.0/slapd slapd
-	newexe ${FILESDIR}/2.0/slurpd slurpd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/2.0/slapd.conf slapd
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo "An LDAP cert already appears to exist, no creating"
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf
-	chmod 0640 /etc/openldap/slapd.conf
-	chown root:ldap /etc/openldap/slapd.conf.default
-	chmod 0640 /etc/openldap/slapd.conf.default
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	# notes from bug #41297, bug #41039
-	ewarn "If you are upgrading from OpenLDAP 2.0, major changes have occured:"
-	ewarn "- bind_anon_dn is now disabled by default for security"
-	ewarn "  add 'allow bind_anon_dn' to your config for the old behavior."
-	ewarn "- Default schemas have changed, you should slapcat your entire DB to"
-	ewarn "  a file, delete your DB, and then slapadd it again. Alternatively"
-	ewarn "  you can try slapindex which should work in almost all cases. Be"
-	ewarn "  sure to check the permissions on the database files afterwards!"
-	if use ssl; then
-		ewarn "- Self-signed SSL certificates are treated harshly by OpenLDAP 2.1"
-		ewarn "  add 'TLS_REQCERT never' if you want to use them."
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-
-	# note to bug #110412
-	echo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-}
diff --git a/net-nds/openldap/openldap-2.2.28-r3.ebuild b/net-nds/openldap/openldap-2.2.28-r3.ebuild
deleted file mode 100644
index 709228fb6611..000000000000
--- a/net-nds/openldap/openldap-2.2.28-r3.ebuild
+++ /dev/null
@@ -1,395 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r3.ebuild,v 1.13 2006/10/18 23:02:30 jokey Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-OLD_PV="2.1.30"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz
-	mirror://openldap/openldap-release/${OLD_P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba sasl slp ssl tcpd selinux"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-# if USE=berkdb
-#	pull in sys-libs/db
-# else if USE=gdbm
-#	pull in sys-libs/gdbm
-# else
-#	pull in sys-libs/db
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND_GDBM=">=sys-libs/gdbm-1.8.0"
-RDEPEND="${RDEPEND}
-	berkdb? ( ${RDEPEND_BERKDB} )
-	!berkdb? (
-		gdbm? ( ${RDEPEND_GDBM} )
-		!gdbm? ( ${RDEPEND_BERKDB} )
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
-
-#DEPEND="${DEPEND} !<net-nds/openldap-2.2"
-
-openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1, and run slapd on this"
-	ewarn "machine please see the ebuild for upgrade instructions, otherwise"
-	ewarn "you may corrupt your database!"
-	echo
-	ewarn "Part of the configuration file syntax has changed:"
-	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo
-	ewarn "You must also run revdep-rebuild after upgrading from 2.1 to 2.2:"
-	ewarn "# revdep-rebuild --library liblber.so.2"
-	ewarn "# revdep-rebuild --library libldap.so.2"
-	ewarn "# revdep-rebuild --library libldap_r.so.2"
-}
-
-pkg_setup() {
-	# grab lines
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	datafiles=""
-	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
-	done
-	# remove extra spaces
-	datafiles="$(echo ${datafiles// })"
-	# TODO: read OPENLDAP_VERSIONTAG instead in future
-	if has_version '<net-nds/openldap-2.2' && [ -n "$datafiles" ]; then
-		eerror "A possible old installation of OpenLDAP was detected"
-		eerror "As major version upgrades to 2.2 can corrupt your database"
-		eerror "You need to dump your database and re-create it afterwards."
-		eerror ""
-		d="$(date -u +%s)"
-		l="/root/ldapdump.${d}"
-		i="${l}.raw"
-		eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-		eerror " 2. slapcat -l ${i}"
-		eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-		eerror " 4. emerge unmerge '<=net-nds/openldap-2.1*'"
-		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data,2.1/"
-		eerror " 6. emerge '>=net-nds/openldap-2.2'"
-		eerror " 7. etc-update, and ensure that you apply the changes"
-		eerror " 8. slapadd -l ${l}"
-		eerror " 9. chown ldap:ldap /var/lib/openldap-data/*"
-		eerror "10. /etc/init.d/slapd start"
-		eerror "11. check that your data is intact."
-		eerror "12. set up the new replication system."
-		eerror ""
-		eerror "This install will not proceed until your old data directory"
-		eerror "is at least moved out of the way."
-		#exit 1
-		die "Warning direct upgrade unsafe!"
-	fi
-	openldap_upgrade_warning
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-}
-
-pkg_preinst() {
-	openldap_upgrade_warning
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# Fix up DB-4.0 linking problem
-	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
-	# stuff).
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# Security bug #96767
-	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	# fix up some automake stuff
-	#sed -i -e 's,^AC_CONFIG_HEADER,AM_CONFIG_HEADER,' ${S}/configure.in
-
-	# ximian connector 1.4.7 ntlm patch
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-ximian_connector.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# reconf compat and current for RPATH solve
-	cd ${WORKDIR}/${OLD_P}
-	einfo "Running libtoolize on ${OLD_P}"
-	libtoolize --copy --force
-	einfo "Running aclocal on ${OLD_P}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${OLD_P}"
-	autoconf || die "autoconf failed"
-
-	cd ${S}
-	einfo "Running libtoolize on ${P}"
-	libtoolize --copy --force
-	einfo "Running aclocal on ${P}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${P}"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# disabled options:
-		# --with-bdb-module=dynamic
-		# alas, for BSD only:
-		# --with-fetch
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd"
-	fi
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# special kerberos stuff
-	tc-export CC
-	if ! use minimal && use kerberos ; then
-		cd ${S}/contrib/slapd-modules/passwd/ && \
-		${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-		-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-		die "failed to compile kerberos module"
-	fi
-
-	# now build old compat lib
-	cd ${OLD_S} && \
-	econf \
-		--disable-static --enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
-		--disable-lmpasswd --disable-spasswd --enable-modules \
-		--disable-phonetic --disable-rewrite --disable-rlookups --disable-slp \
-		--disable-wrappers --disable-bdb --disable-dnssrv --disable-ldap \
-		--disable-ldbm --disable-meta --disable-monitor --disable-null \
-		--disable-passwd --disable-perl --disable-shell --disable-sql \
-		--disable-slurpd || die "configure-2.1 failed"
-	make depend || die "make-2.1 depend failed"
-	cd ${OLD_S}/libraries/liblber && make liblber.la || die "make-2.1 liblber.la failed"
-	cd ${OLD_S}/libraries/libldap && make libldap.la || die "make-2.1 libldap.la failed"
-	cd ${OLD_S}/libraries/libldap_r && make libldap_r.la || die "make-2.1 libldap_r.la failed"
-}
-
-src_test() {
-	einfo "Doing tests"
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		if use kerberos && [ -f ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			insinto /usr/$(get_libdir)/openldap/openldap
-			doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		#newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	dolib.so ${OLD_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
-	die "failed to install old liblber"
-	dolib.so ${OLD_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
-	die "failed to install old libldap"
-	dolib.so ${OLD_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
-	die "failed to install old libldap_r"
-}
-
-pkg_postinst() {
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo "An LDAP cert already appears to exist, no creating"
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-	fi
-	openldap_upgrade_warning
-}
diff --git a/net-nds/openldap/openldap-2.2.28-r4.ebuild b/net-nds/openldap/openldap-2.2.28-r4.ebuild
deleted file mode 100644
index 69dea637fc36..000000000000
--- a/net-nds/openldap/openldap-2.2.28-r4.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r4.ebuild,v 1.5 2006/09/11 12:22:39 jokey Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib libtool
-
-OLD_PV="2.1.30"
-OLD_P="${PN}-${OLD_PV}"
-OLD_S="${WORKDIR}/${OLD_P}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz
-	mirror://openldap/openldap-release/${OLD_P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba sasl slp ssl tcpd selinux"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-# if USE=berkdb
-#	pull in sys-libs/db
-# else if USE=gdbm
-#	pull in sys-libs/gdbm
-# else
-#	pull in sys-libs/db
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND_GDBM=">=sys-libs/gdbm-1.8.0"
-RDEPEND="${RDEPEND}
-	berkdb? ( ${RDEPEND_BERKDB} )
-	!berkdb? (
-		gdbm? ( ${RDEPEND_GDBM} )
-		!gdbm? ( ${RDEPEND_BERKDB} )
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
-
-#DEPEND="${DEPEND} !<net-nds/openldap-2.2"
-
-openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1, and run slapd on this"
-	ewarn "machine please see the ebuild for upgrade instructions, otherwise"
-	ewarn "you may corrupt your database!"
-	echo
-	ewarn "Part of the configuration file syntax has changed:"
-	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo
-	ewarn "You must also run revdep-rebuild after upgrading from 2.1 to 2.2:"
-	ewarn "# revdep-rebuild --library liblber.so.2"
-	ewarn "# revdep-rebuild --library libldap.so.2"
-	ewarn "# revdep-rebuild --library libldap_r.so.2"
-}
-
-pkg_setup() {
-	# grab lines
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	datafiles=""
-	for d in $openldap_datadirs; do
-		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
-	done
-	# remove extra spaces
-	datafiles="$(echo ${datafiles// })"
-	# TODO: read OPENLDAP_VERSIONTAG instead in future
-	if has_version '<net-nds/openldap-2.2' && [ -n "$datafiles" ]; then
-		eerror "A possible old installation of OpenLDAP was detected"
-		eerror "As major version upgrades to 2.2 can corrupt your database"
-		eerror "You need to dump your database and re-create it afterwards."
-		eerror ""
-		d="$(date -u +%s)"
-		l="/root/ldapdump.${d}"
-		i="${l}.raw"
-		eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-		eerror " 2. slapcat -l ${i}"
-		eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-		eerror " 4. emerge unmerge '<=net-nds/openldap-2.1*'"
-		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data,2.1/"
-		eerror " 6. emerge '>=net-nds/openldap-2.2'"
-		eerror " 7. etc-update, and ensure that you apply the changes"
-		eerror " 8. slapadd -l ${l}"
-		eerror " 9. chown ldap:ldap /var/lib/openldap-data/*"
-		eerror "10. /etc/init.d/slapd start"
-		eerror "11. check that your data is intact."
-		eerror "12. set up the new replication system."
-		eerror ""
-		eerror "This install will not proceed until your old data directory"
-		eerror "is at least moved out of the way."
-		#exit 1
-		die "Warning direct upgrade unsafe!"
-	fi
-	openldap_upgrade_warning
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-}
-
-pkg_preinst() {
-	openldap_upgrade_warning
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# Fix up DB-4.0 linking problem
-	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
-	# stuff).
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# Security bug #96767
-	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	# fix up some automake stuff
-	#sed -i -e 's,^AC_CONFIG_HEADER,AM_CONFIG_HEADER,' ${S}/configure.in
-
-	# ximian connector 1.4.7 ntlm patch
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-ximian_connector.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${OLD_S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-	EPATCH_OPTS="-p0 -d ${S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-
-	# make tests rpath ready
-	EPATCH_OPTS="-p0 -d ${S}/tests" epatch ${FILESDIR}/${PN}-2.2.28-tests.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p1 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-glibc24.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-glibc24.patch
-
-	# add cleartext passwords backport bug #112554
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-cleartext-passwords.patch
-
-	# reconf compat and current for RPATH solve
-	cd ${WORKDIR}/${OLD_P}
-	einfo "Running libtoolize on ${OLD_P}"
-	libtoolize --copy --force --automake
-	einfo "Running aclocal on ${OLD_P}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${OLD_P}"
-	autoconf || die "autoconf failed"
-
-	cd ${S}
-	einfo "Running libtoolize on ${P}"
-	libtoolize --copy --force --automake
-	einfo "Running aclocal on ${P}"
-	aclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-	einfo "Running autoconf on ${P}"
-	autoconf || die "autoconf failed"
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# disabled options:
-		# --with-bdb-module=dynamic
-		# alas, for BSD only:
-		# --with-fetch
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd"
-	fi
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# special kerberos stuff
-	tc-export CC
-	if ! use minimal && use kerberos ; then
-		cd ${S}/contrib/slapd-modules/passwd/ && \
-		${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-		-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-		die "failed to compile kerberos module"
-	fi
-
-	# now build old compat lib
-	cd ${OLD_S} && \
-	econf \
-		--disable-static --enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
-		--disable-lmpasswd --disable-spasswd --enable-modules \
-		--disable-phonetic --disable-rewrite --disable-rlookups --disable-slp \
-		--disable-wrappers --disable-bdb --disable-dnssrv --disable-ldap \
-		--disable-ldbm --disable-meta --disable-monitor --disable-null \
-		--disable-passwd --disable-perl --disable-shell --disable-sql \
-		--disable-slurpd || die "configure-2.1 failed"
-	make depend || die "make-2.1 depend failed"
-	cd ${OLD_S}/libraries/liblber && make liblber.la || die "make-2.1 liblber.la failed"
-	cd ${OLD_S}/libraries/libldap && make libldap.la || die "make-2.1 libldap.la failed"
-	cd ${OLD_S}/libraries/libldap_r && make libldap_r.la || die "make-2.1 libldap_r.la failed"
-}
-
-src_test() {
-	einfo "Doing tests"
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		if use kerberos && [ -f ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			insinto /usr/$(get_libdir)/openldap/openldap
-			doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		#newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	dolib.so ${OLD_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
-	die "failed to install old liblber"
-	dolib.so ${OLD_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
-	die "failed to install old libldap"
-	dolib.so ${OLD_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
-	die "failed to install old libldap_r"
-}
-
-pkg_postinst() {
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo "An LDAP cert already appears to exist, no creating"
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-	fi
-	openldap_upgrade_warning
-
-	# Reference inclusion bug #77330
-	echo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-
-	# note to bug #110412
-	echo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-}
diff --git a/net-nds/openldap/openldap-2.3.24-r2.ebuild b/net-nds/openldap/openldap-2.3.24-r2.ebuild
deleted file mode 100644
index b0d055be6706..000000000000
--- a/net-nds/openldap/openldap-2.3.24-r2.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.24-r2.ebuild,v 1.4 2006/09/18 13:42:22 strerror Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline samba sasl slp ssl tcpd selinux"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND=">=sys-libs/ncurses-5.1
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )
-	berkdb? ( ${RDEPEND_BERKDB} )
-	!berkdb? (
-		gdbm? ( >=sys-libs/gdbm-1.8.0 )
-		!gdbm? ( ${RDEPEND_BERKDB} )
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_upgrade_howto() {
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	die "You need to upgrade your database first"
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs 
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	for each in ${openldap_datadirs}; do
-		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
-		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
-		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
-			einfo "- Checking ${each}..."
-			if [ -r ${CURRENT_TAG} ] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source ${CURRENT_TAG}
-				if [ "${OLDPF}" == "" ] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
-
-				# are we on the same branch?
-				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-
-	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-	    einfo
-	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	    einfo
-	else
-	    openldap_find_versiontags
-	fi
-
-}
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	EPATCH_OPTS="-p0 -d ${S}"
-
-	# ximian connector 1.4.7 ntlm patch
-	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# bug #132263
-	if use overlays ; then
-		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
-	fi
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	# bug #116045
-	# patch contrib modules
-	if ! use minimal ; then
-	    cd ${S}/contrib
-	    epatch ${FILESDIR}/${P}-contrib-smbk5pwd.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal ; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm ; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd"
-	fi
-
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-	myconf="${myconf} `use_enable overlays`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# openldap/contrib
-	tc-export CC
-	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
-		# kerberos passwd
-		if use kerberos ; then
-			einfo "Building contributed pw-kerberos"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-			die "failed to compile kerberos password module"
-		fi
-		# netscape mta-md5 password
-			einfo "Building contributed pw-netscape"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o pw-netscape.so netscape.c || \
-			die "failed to compile netscape password module"
-		# smbk5pwd overlay
-		# Note: this modules builds, but may not work with
-		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
-		#   Kerberos.
-		if use samba ; then
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			use samba && mydef="-DDO_SAMBA"
-			if use kerberos; then
-				mydef="${mydef} -DDO_KRB5"
-				if [ -d /usr/include/heimdal ]; then
-					mykrb5inc="-I/usr/include/heimdal/"
-				fi
-			fi
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		fi
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
-	fi
-}
-
-src_test() {
-	einfo
-	einfo "Doing tests"
-	einfo
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		# install contributed modules
-		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
-			die "failed to install Netscape MTA-MD5 passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
-		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
-			cd ${S}/contrib/slapd-tools
-			exeinto /usr/bin
-			newexe statslog ldapstatslog || \
-			die "failed to install ldapstatslog script"
-		fi
-		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
-
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib ${each}
-	done
-}
-
-pkg_postinst() {
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo
-			einfo "An LDAP cert already appears to exist, no creating"
-			einfo
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-		ewarn
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	einfo
-
-	# note to bug #110412
-	echo
-	einfo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-	einfo
-
-	echo
-	einfo
-	einfo "*** Remember to run revdep-rebuild to update your packages ***"
-	einfo
-}
diff --git a/net-nds/openldap/openldap-2.3.27-r1.ebuild b/net-nds/openldap/openldap-2.3.27-r1.ebuild
deleted file mode 100644
index 46f1ac13f863..000000000000
--- a/net-nds/openldap/openldap-2.3.27-r1.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.27-r1.ebuild,v 1.1 2006/10/01 00:43:58 robbat2 Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline samba sasl slp ssl tcpd selinux"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND=">=sys-libs/ncurses-5.1
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	!minimal? (
-		odbc? ( dev-db/unixODBC )
-		slp? ( >=net-libs/openslp-1.0 )
-		perl? ( >=dev-lang/perl-5.6 )
-		samba? ( >=dev-libs/openssl-0.9.6 )
-		kerberos? ( virtual/krb5 )
-		berkdb? ( ${RDEPEND_BERKDB} )
-		!berkdb? (
-			gdbm? ( >=sys-libs/gdbm-1.8.0 )
-			!gdbm? ( ${RDEPEND_BERKDB} )
-		)
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_upgrade_howto() {
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	die "You need to upgrade your database first"
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs 
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	for each in ${openldap_datadirs}; do
-		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
-		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
-		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
-			einfo "- Checking ${each}..."
-			if [ -r ${CURRENT_TAG} ] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source ${CURRENT_TAG}
-				if [ "${OLDPF}" == "" ] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
-
-				# are we on the same branch?
-				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-
-	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-	    einfo
-	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	    einfo
-	else
-	    openldap_find_versiontags
-	fi
-
-}
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	EPATCH_OPTS="-p0 -d ${S}"
-
-	# ximian connector 1.4.7 ntlm patch
-	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# bug #132263
-	if use overlays ; then
-		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
-	fi
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk
-
-	# bug #116045
-	# patch contrib modules
-	if ! use minimal ; then
-	    cd ${S}/contrib
-	    epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal ; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm ; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} --enable-relay=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-		myconf="${myconf} `use_enable overlays overlays mod`"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-ldbm"
-		myconf="${myconf} --disable-hdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd --disable-overlays"
-		myconf="${myconf} --disable-relay"
-	fi
-
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	STRIP=/bin/true \
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# openldap/contrib
-	tc-export CC
-	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
-		# kerberos passwd
-		if use kerberos ; then
-			einfo "Building contributed pw-kerberos"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-			die "failed to compile kerberos password module"
-		fi
-		# netscape mta-md5 password
-			einfo "Building contributed pw-netscape"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o pw-netscape.so netscape.c || \
-			die "failed to compile netscape password module"
-		# smbk5pwd overlay
-		# Note: this modules builds, but may not work with
-		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
-		#   Kerberos.
-		if use samba ; then
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			use samba && mydef="-DDO_SAMBA"
-			if use kerberos; then
-				mydef="${mydef} -DDO_KRB5"
-				if [ -d /usr/include/heimdal ]; then
-					mykrb5inc="-I/usr/include/heimdal/"
-				fi
-			fi
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		fi
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
-	fi
-}
-
-src_test() {
-	einfo
-	einfo "Doing tests"
-	einfo
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	local dirlist="data"
-	if ! use minimal; then
-		dirlist="${dirlist} slurp ldbm"
-	fi
-	for x in ${dirlist}; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		# install contributed modules
-		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
-			die "failed to install Netscape MTA-MD5 passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
-		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
-			cd ${S}/contrib/slapd-tools
-			exeinto /usr/bin
-			newexe statslog ldapstatslog || \
-			die "failed to install ldapstatslog script"
-		fi
-		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
-
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib ${each}
-	done
-}
-
-pkg_postinst() {
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo
-			einfo "An LDAP cert already appears to exist, no creating"
-			einfo
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-		ewarn
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	einfo
-
-	# note to bug #110412
-	echo
-	einfo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-	einfo
-
-	echo
-	einfo
-	einfo "*** Remember to run revdep-rebuild to update your packages ***"
-	einfo
-}
diff --git a/net-nds/openldap/openldap-2.3.27-r2.ebuild b/net-nds/openldap/openldap-2.3.27-r2.ebuild
deleted file mode 100644
index 6c9928408e1e..000000000000
--- a/net-nds/openldap/openldap-2.3.27-r2.ebuild
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.27-r2.ebuild,v 1.11 2006/10/19 12:50:23 agriffis Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline
-samba sasl slp smbkrb5passwd ssl tcpd selinux"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND="sys-libs/ncurses
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	readline? ( sys-libs/readline )
-	sasl? ( dev-libs/cyrus-sasl )
-	!minimal? (
-		odbc? ( dev-db/unixODBC )
-		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl )
-		samba? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-		berkdb? ( ${RDEPEND_BERKDB} )
-		!berkdb? (
-			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( ${RDEPEND_BERKDB} )
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl
-			app-crypt/heimdal
-		)
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_upgrade_howto() {
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	die "You need to upgrade your database first"
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs 
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	for each in ${openldap_datadirs}; do
-		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
-		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
-		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
-			einfo "- Checking ${each}..."
-			if [ -r ${CURRENT_TAG} ] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source ${CURRENT_TAG}
-				if [ "${OLDPF}" == "" ] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
-
-				# are we on the same branch?
-				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-
-	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-	    einfo
-	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	    einfo
-	else
-	    openldap_find_versiontags
-	fi
-
-}
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	EPATCH_OPTS="-p0 -d ${S}"
-
-	# ximian connector 1.4.7 ntlm patch
-	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# bug #132263
-	if use overlays ; then
-		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
-	fi
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk
-
-	# bug #116045
-	# patch contrib modules
-	if ! use minimal ; then
-	    cd ${S}/contrib
-	    epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal ; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm ; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} --enable-relay=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-		myconf="${myconf} `use_enable overlays overlays mod`"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-ldbm"
-		myconf="${myconf} --disable-hdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd --disable-overlays"
-		myconf="${myconf} --disable-relay"
-	fi
-
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	STRIP=/bin/true \
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# openldap/contrib
-	tc-export CC
-	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
-		# kerberos passwd
-		if use kerberos ; then
-			einfo "Building contributed pw-kerberos"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-			die "failed to compile kerberos password module"
-		fi
-		# netscape mta-md5 password
-			einfo "Building contributed pw-netscape"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o pw-netscape.so netscape.c || \
-			die "failed to compile netscape password module"
-		# smbk5pwd overlay
-		# Note: this modules builds, but may not work with
-		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
-		#   Kerberos.
-		if use smbkrb5passwd ; then
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			mydef="-DDO_SAMBA -DDO_KRB5"
-			mykrb5inc="-I/usr/include/heimdal/"
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		fi
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
-	fi
-}
-
-src_test() {
-	einfo
-	einfo "Doing tests"
-	einfo
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	local dirlist="data"
-	if ! use minimal; then
-		dirlist="${dirlist} slurp ldbm"
-	fi
-	for x in ${dirlist}; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		# install contributed modules
-		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
-			die "failed to install Netscape MTA-MD5 passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
-		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
-			cd ${S}/contrib/slapd-tools
-			exeinto /usr/bin
-			newexe statslog ldapstatslog || \
-			die "failed to install ldapstatslog script"
-		fi
-		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
-
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib ${each}
-	done
-}
-
-pkg_postinst() {
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo
-			einfo "An LDAP cert already appears to exist, no creating"
-			einfo
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-		ewarn
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	einfo
-
-	# note to bug #110412
-	echo
-	einfo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-	einfo
-
-	if has_version "<net-nds/openldap-2.3" ; then
-		echo
-		einfo
-		einfo "*** Remember to run revdep-rebuild to update your packages ***"
-		einfo
-	fi
-}
diff --git a/net-nds/openldap/openldap-2.3.27.ebuild b/net-nds/openldap/openldap-2.3.27.ebuild
deleted file mode 100644
index 9738ff5d8329..000000000000
--- a/net-nds/openldap/openldap-2.3.27.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.27.ebuild,v 1.4 2006/10/04 19:52:23 jokey Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline samba sasl slp ssl tcpd selinux"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND=">=sys-libs/ncurses-5.1
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
-	odbc? ( dev-db/unixODBC )
-	slp? ( >=net-libs/openslp-1.0 )
-	perl? ( >=dev-lang/perl-5.6 )
-	samba? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 )
-	berkdb? ( ${RDEPEND_BERKDB} )
-	!berkdb? (
-		gdbm? ( >=sys-libs/gdbm-1.8.0 )
-		!gdbm? ( ${RDEPEND_BERKDB} )
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_upgrade_howto() {
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	die "You need to upgrade your database first"
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs 
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	for each in ${openldap_datadirs}; do
-		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
-		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
-		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
-			einfo "- Checking ${each}..."
-			if [ -r ${CURRENT_TAG} ] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source ${CURRENT_TAG}
-				if [ "${OLDPF}" == "" ] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
-
-				# are we on the same branch?
-				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-
-	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-	    einfo
-	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	    einfo
-	else
-	    openldap_find_versiontags
-	fi
-
-}
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	EPATCH_OPTS="-p0 -d ${S}"
-
-	# ximian connector 1.4.7 ntlm patch
-	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# bug #132263
-	if use overlays ; then
-		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
-	fi
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-
-	# bug #116045
-	# patch contrib modules
-	if ! use minimal ; then
-	    cd ${S}/contrib
-	    epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal ; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm ; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd"
-	fi
-
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-	myconf="${myconf} `use_enable overlays`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# openldap/contrib
-	tc-export CC
-	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
-		# kerberos passwd
-		if use kerberos ; then
-			einfo "Building contributed pw-kerberos"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-			die "failed to compile kerberos password module"
-		fi
-		# netscape mta-md5 password
-			einfo "Building contributed pw-netscape"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o pw-netscape.so netscape.c || \
-			die "failed to compile netscape password module"
-		# smbk5pwd overlay
-		# Note: this modules builds, but may not work with
-		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
-		#   Kerberos.
-		if use samba ; then
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			use samba && mydef="-DDO_SAMBA"
-			if use kerberos; then
-				mydef="${mydef} -DDO_KRB5"
-				if [ -d /usr/include/heimdal ]; then
-					mykrb5inc="-I/usr/include/heimdal/"
-				fi
-			fi
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		fi
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
-	fi
-}
-
-src_test() {
-	einfo
-	einfo "Doing tests"
-	einfo
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	for x in data slurp ldbm; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		# install contributed modules
-		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
-			die "failed to install Netscape MTA-MD5 passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
-		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
-			cd ${S}/contrib/slapd-tools
-			exeinto /usr/bin
-			newexe statslog ldapstatslog || \
-			die "failed to install ldapstatslog script"
-		fi
-		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
-
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib ${each}
-	done
-}
-
-pkg_postinst() {
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo
-			einfo "An LDAP cert already appears to exist, no creating"
-			einfo
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-		ewarn
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	einfo
-
-	# note to bug #110412
-	echo
-	einfo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-	einfo
-
-	echo
-	einfo
-	einfo "*** Remember to run revdep-rebuild to update your packages ***"
-	einfo
-}
diff --git a/net-nds/openldap/openldap-2.3.30.ebuild b/net-nds/openldap/openldap-2.3.30.ebuild
deleted file mode 100644
index fa3483fa83f3..000000000000
--- a/net-nds/openldap/openldap-2.3.30.ebuild
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.30.ebuild,v 1.1 2006/11/26 23:32:02 hansmi Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline
-samba sasl slp smbkrb5passwd ssl tcpd selinux"
-
-# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
-# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
-# mine at work)!
-# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
-
-RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
-RDEPEND="sys-libs/ncurses
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	readline? ( sys-libs/readline )
-	sasl? ( dev-libs/cyrus-sasl )
-	!minimal? (
-		odbc? ( dev-db/unixODBC )
-		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl )
-		samba? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-		berkdb? ( ${RDEPEND_BERKDB} )
-		!berkdb? (
-			gdbm? ( sys-libs/gdbm )
-			!gdbm? ( ${RDEPEND_BERKDB} )
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl
-			app-crypt/heimdal
-		)
-	)
-	selinux? ( sec-policy/selinux-openldap )"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-openldap_upgrade_howto() {
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	die "You need to upgrade your database first"
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
-		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
-	fi
-	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	for each in ${openldap_datadirs}; do
-		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
-		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
-		if [ -d ${CURRENT_TAGDIR} ] &&  [ ${openldap_found_tag} == 0 ] ; then
-			einfo "- Checking ${each}..."
-			if [ -r ${CURRENT_TAG} ] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source ${CURRENT_TAG}
-				if [ "${OLDPF}" == "" ] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
-
-				# are we on the same branch?
-				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-
-}
-
-pkg_setup() {
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
-	fi
-
-	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
-	    einfo
-	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	    einfo
-	else
-	    openldap_find_versiontags
-	fi
-
-}
-
-pkg_preinst() {
-	enewgroup ldap 439
-	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# According to MDK, the link order needs to be changed so that
-	# on systems w/ MD5 passwords the system crypt library is used
-	# (the net result is that "passwd" can be used to change ldap passwords w/
-	#  proper pam support)
-	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ensure correct SLAPI path by default
-	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
-
-	EPATCH_OPTS="-p0 -d ${S}"
-
-	# ximian connector 1.4.7 ntlm patch
-	epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# bug #132263
-	if use overlays ; then
-		epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch
-	fi
-
-	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
-	# do it perfectly.
-	cd ${S}/build
-	ln -s shtool install
-	ln -s shtool install.sh
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to block stripping"
-
-	# bug #116045
-	# patch contrib modules
-	if ! use minimal ; then
-	    cd ${S}/contrib
-	    epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# HDB is only available with BerkDB
-	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
-	myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb'
-
-	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
-
-	# enable slapd/slurpd servers if not doing a minimal build
-	if ! use minimal ; then
-		myconf="${myconf} --enable-slapd --enable-slurpd"
-		# base backend stuff
-		myconf="${myconf} --enable-ldbm"
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		elif use gdbm ; then
-			einfo "Using GDBM for local backend"
-			myconf="${myconf} ${myconf_gdbm}"
-		else
-			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
-			ewarn "Berkeley DB for local backend"
-			myconf="${myconf} ${myconf_berkdb}"
-		fi
-		# extra backend stuff
-		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
-		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
-		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
-		myconf="${myconf} --enable-null=mod --enable-shell=mod"
-		myconf="${myconf} --enable-relay=mod"
-		myconf="${myconf} `use_enable perl perl mod`"
-		myconf="${myconf} `use_enable odbc sql mod`"
-		# slapd options
-		myconf="${myconf} `use_enable crypt` `use_enable slp`"
-		myconf="${myconf} --enable-rewrite --enable-rlookups"
-		myconf="${myconf} --enable-aci --enable-modules"
-		myconf="${myconf} --enable-cleartext --enable-slapi"
-		myconf="${myconf} `use_with samba lmpasswd`"
-		# slapd overlay options
-		myconf="${myconf} --enable-dyngroup --enable-proxycache"
-		myconf="${myconf} `use_enable overlays overlays mod`"
-	else
-		myconf="${myconf} --disable-slapd --disable-slurpd"
-		myconf="${myconf} --disable-bdb --disable-ldbm"
-		myconf="${myconf} --disable-hdb --disable-monitor"
-		myconf="${myconf} --disable-slurpd --disable-overlays"
-		myconf="${myconf} --disable-relay"
-	fi
-
-	# basic functionality stuff
-	myconf="${myconf} --enable-syslog --enable-dynamic"
-	myconf="${myconf} --enable-local --enable-proctitle"
-
-	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
-	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
-	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
-
-	if [ $(get_libdir) != "lib" ] ; then
-		append-ldflags -L/usr/$(get_libdir)
-	fi
-
-	STRIP=/bin/true \
-	econf \
-		--enable-static \
-		--enable-shared \
-		--libexecdir=/usr/$(get_libdir)/openldap \
-		${myconf} || die "configure failed"
-
-	make depend || die "make depend failed"
-	make || die "make failed"
-
-	# openldap/contrib
-	tc-export CC
-	if ! use minimal ; then
-		# dsaschema
-			einfo "Building contributed dsaschema"
-			cd ${S}/contrib/slapd-modules/dsaschema
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-Wall -o libdsaschema-plugin.so dsaschema.c || \
-			die "failed to compile dsaschema module"
-		# kerberos passwd
-		if use kerberos ; then
-			einfo "Building contributed pw-kerberos"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-			die "failed to compile kerberos password module"
-		fi
-		# netscape mta-md5 password
-			einfo "Building contributed pw-netscape"
-			cd ${S}/contrib/slapd-modules/passwd/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o pw-netscape.so netscape.c || \
-			die "failed to compile netscape password module"
-		# smbk5pwd overlay
-		# Note: this modules builds, but may not work with
-		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
-		#   Kerberos.
-		if use smbkrb5passwd ; then
-			einfo "Building contributed smbk5pwd"
-			local mydef
-			local mykrb5inc
-			mydef="-DDO_SAMBA -DDO_KRB5"
-			mykrb5inc="-I/usr/include/heimdal/"
-			cd ${S}/contrib/slapd-modules/smbk5pwd && \
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
-			die "failed to compile smbk5pwd module"
-		fi
-		# addrdnvalues
-			einfo "Building contributed addrdnvalues"
-			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
-			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
-			die "failed to compile addrdnvalues plugin"
-	fi
-}
-
-src_test() {
-	einfo
-	einfo "Doing tests"
-	einfo
-	cd tests ; make tests || die "make tests failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
-	docinto rfc ; dodoc doc/rfc/*.txt
-
-	# openldap modules go here
-	# TODO: write some code to populate slapd.conf with moduleload statements
-	keepdir /usr/$(get_libdir)/openldap/openldap/
-
-	# make state directories
-	local dirlist="data"
-	if ! use minimal; then
-		dirlist="${dirlist} slurp ldbm"
-	fi
-	for x in ${dirlist}; do
-		keepdir /var/lib/openldap-${x}
-		fowners ldap:ldap /var/lib/openldap-${x}
-		fperms 0700 /var/lib/openldap-${x}
-	done
-
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-
-	# manually remove /var/tmp references in .la
-	# because it is packaged with an ancient libtool
-	for x in ${D}/usr/$(get_libdir)/lib*.la; do
-		sed -i -e "s:-L${S}[/]*libraries::" ${x}
-	done
-
-	# change slapd.pid location in configuration file
-	keepdir /var/run/openldap
-	fowners ldap:ldap /var/run/openldap
-	fperms 0755 /var/run/openldap
-
-	if ! use minimal; then
-		# config modifications
-		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
-			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
-			fowners root:ldap ${f}
-			fperms 0640 ${f}
-		done
-		# install our own init scripts
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/2.0/slapd slapd
-		newexe ${FILESDIR}/2.0/slurpd slurpd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
-		fi
-		insinto /etc/conf.d
-		newins ${FILESDIR}/2.0/slapd.conf slapd
-		# install contributed modules
-		docinto /
-		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
-		then
-			cd ${S}/contrib/slapd-modules/dsaschema/
-			newdoc README README.contrib.dsaschema
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libdsaschema-plugin.so || \
-			die "failed to install dsaschema module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe pw-kerberos.so || \
-			die "failed to install kerberos passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
-			cd ${S}/contrib/slapd-modules/passwd/
-			newdoc README README.contrib.passwd
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
-			die "failed to install Netscape MTA-MD5 passwd module"
-		fi
-		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
-			cd ${S}/contrib/slapd-modules/smbk5pwd
-			newdoc README.contrib.smbk5pwd
-			libexecdir="/usr/$(get_libdir)/openldap" \
-			DESTDIR="${D}" make install-mod || \
-			die "failed to install smbk5pwd overlay module"
-		fi
-		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
-			cd ${S}/contrib/slapd-tools
-			exeinto /usr/bin
-			newexe statslog ldapstatslog || \
-			die "failed to install ldapstatslog script"
-		fi
-		if [ -e ${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
-		then
-			cd ${S}/contrib/slapi-plugins/addrdnvalues
-			newdoc README README.contrib.addrdnvalues
-			exeinto /usr/$(get_libdir)/openldap/openldap
-			doexe libaddrdnvalues-plugin.so || \
-			die "failed to install addrdnvalues plugin"
-		fi
-
-	fi
-
-	# install MDK's ssl cert script
-	if use ssl || use samba; then
-		dodir /etc/openldap/ssl
-		exeinto /etc/openldap/ssl
-		doexe ${FILESDIR}/gencert.sh
-	fi
-
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib ${each}
-	done
-}
-
-pkg_postinst() {
-	# keep old libs if any
-	# from 2.1
-	for each in ${ROOT}usr/$(get_libdir)/liblber.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r.so.2.0.1* ; do
-		preserve_old_lib_notify ${each}
-	done
-	# from 2.2
-	for each in ${ROOT}usr/$(get_libdir)/liblber-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-	for each in ${ROOT}usr/$(get_libdir)/libldap_r-2.2* ; do
-		preserve_old_lib_notify ${each}
-	done
-
-	if use ssl; then
-		# make a self-signed ssl cert (if there isn't one there already)
-		if [ ! -e /etc/openldap/ssl/ldap.pem ]
-		then
-			cd /etc/openldap/ssl
-			yes "" | sh gencert.sh
-			chmod 640 ldap.pem
-			chown root:ldap ldap.pem
-		else
-			einfo
-			einfo "An LDAP cert already appears to exist, no creating"
-			einfo
-		fi
-	fi
-
-	# Since moving to running openldap as user ldap there are some
-	# permissions problems with directories and files.
-	# Let's make sure these permissions are correct.
-	chown ldap:ldap /var/run/openldap
-	chmod 0755 /var/run/openldap
-	chown root:ldap /etc/openldap/slapd.conf{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
-
-	if use ssl; then
-		ewarn
-		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-		ewarn "add 'TLS_REQCERT never' if you want to use them."
-		ewarn
-	fi
-
-	# Reference inclusion bug #77330
-	echo
-	einfo
-	einfo "Getting started using OpenLDAP? There is some documentation available:"
-	einfo "Gentoo Guide to OpenLDAP Authentication"
-	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
-	einfo
-
-	# note to bug #110412
-	echo
-	einfo
-	einfo "An example file for tuning BDB backends with openldap is:"
-	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
-	einfo
-
-	if has_version "<net-nds/openldap-2.3" ; then
-		echo
-		einfo
-		einfo "*** Remember to run revdep-rebuild to update your packages ***"
-		einfo
-	fi
-}
author	Markus Ullmann <jokey@gentoo.org>	2006-12-23 16:11:23 +0000
committer	Markus Ullmann <jokey@gentoo.org>	2006-12-23 16:11:23 +0000
commit	1b467460acca371f55034fd7f753848b6c1fd9f2 (patch)
tree	9cefef06bf913eeeb7a8f461ff6bbe3aa15a3814 /net-nds/openldap
parent	arm stable wrt bug #154349 and security cleanup (diff)
download	gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.tar.gz gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.tar.bz2 gentoo-2-1b467460acca371f55034fd7f753848b6c1fd9f2.zip