Cleaning up / renewing digest

Package-Manager: portage-2.1_pre9-r4

7 files changed, 72 insertions, 1505 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index df05407ebbec..10c59ae2ff89 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,157 +1,168 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24c083984e7d2b976550bba92f04ec33 ChangeLog 30378
-RMD160 beaf488a75b615345ec733cdff39845396f2313b ChangeLog 30378
-SHA256 98223d6101f3455ac41f343ad53c37f7d7162a266172929a9e536de9e23ef7d9 ChangeLog 30378
+AUX 2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 SHA1 5b9b3418b433c15df1a0cb72d2c7f8f361cf33e1 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4 size 584
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 files/2.0/slapd 584
 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4 files/2.0/slapd 584
+AUX 2.0/slapd.conf 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d size 436
 MD5 b672311fca605c398240cd37a2ae080a files/2.0/slapd.conf 436
 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 files/2.0/slapd.conf 436
 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d files/2.0/slapd.conf 436
+AUX 2.0/slurpd 495 RMD160 44a8cd8cb7fb7f88df686f5d43959a33a218166e SHA1 17ce85dc8515a2a5cfdf8e03e7c9227210e1a631 SHA256 de81e634ec905bbff0e05cb4d43eab4bbe2e5bae35cc24afdb2e24a89ef7e4af size 495
 MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
 RMD160 44a8cd8cb7fb7f88df686f5d43959a33a218166e files/2.0/slurpd 495
 SHA256 de81e634ec905bbff0e05cb4d43eab4bbe2e5bae35cc24afdb2e24a89ef7e4af files/2.0/slurpd 495
+AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b size 746
 MD5 d00ccd5b4b44ac1df463da80d5ebb8a1 files/DB_CONFIG.fast.example 746
 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 files/DB_CONFIG.fast.example 746
 SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b files/DB_CONFIG.fast.example 746
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
-RMD160 c832617d0c9d16bc3ddcc9fb1184b54ba74b7b2b files/digest-openldap-2.1.30-r2 65
-SHA256 7f1b2751f4f8bfe3c87f42c8e726b527aa65f9335c048667e7471fbe6c52af12 files/digest-openldap-2.1.30-r2 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r5 65
-RMD160 c832617d0c9d16bc3ddcc9fb1184b54ba74b7b2b files/digest-openldap-2.1.30-r5 65
-SHA256 7f1b2751f4f8bfe3c87f42c8e726b527aa65f9335c048667e7471fbe6c52af12 files/digest-openldap-2.1.30-r5 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r6 65
-RMD160 c832617d0c9d16bc3ddcc9fb1184b54ba74b7b2b files/digest-openldap-2.1.30-r6 65
-SHA256 7f1b2751f4f8bfe3c87f42c8e726b527aa65f9335c048667e7471fbe6c52af12 files/digest-openldap-2.1.30-r6 65
-MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r7 65
-RMD160 c832617d0c9d16bc3ddcc9fb1184b54ba74b7b2b files/digest-openldap-2.1.30-r7 65
-SHA256 7f1b2751f4f8bfe3c87f42c8e726b527aa65f9335c048667e7471fbe6c52af12 files/digest-openldap-2.1.30-r7 65
-MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23-r1 65
-RMD160 4656047555c9d2edac1dd09a7efd73d7f7abf4f2 files/digest-openldap-2.2.23-r1 65
-SHA256 67a5e1a90d11a727d404e35f88da676f197c621c81cbd14f4a0c2735848bd6b9 files/digest-openldap-2.2.23-r1 65
-MD5 dd664a5abce13e402f1e0322ce2464fd files/digest-openldap-2.2.28-r3 130
-RMD160 85448bb74498ba1d58b30603c23de136cb6c5a98 files/digest-openldap-2.2.28-r3 130
-SHA256 d20034eb3df60ad22bae0538638a41a1e570a93a8ff2a1857d15e407ac6b658a files/digest-openldap-2.2.28-r3 130
-MD5 dd664a5abce13e402f1e0322ce2464fd files/digest-openldap-2.2.28-r4 130
-RMD160 85448bb74498ba1d58b30603c23de136cb6c5a98 files/digest-openldap-2.2.28-r4 130
-SHA256 d20034eb3df60ad22bae0538638a41a1e570a93a8ff2a1857d15e407ac6b658a files/digest-openldap-2.2.28-r4 130
-MD5 45ed15fd98376da964b0fabac57a839a files/digest-openldap-2.3.18 195
-RMD160 94ee0ffa96ef5fb8e2e4903645559f9a158da4ca files/digest-openldap-2.3.18 195
-SHA256 e5cee751e402c17ffa84e85a9b2c771d7977f6fc643bc186e3c447e0029b87b4 files/digest-openldap-2.3.18 195
-MD5 b4512f1af83b238598f391f3078a78ed files/digest-openldap-2.3.19 723
-RMD160 7ab755cccb6e42e891f2605d9d0402b8b4c7b642 files/digest-openldap-2.3.19 723
-SHA256 8b090d314904c0c274ff47ff54db16a98243b2c6c1440ba04faa44e1ae0146c7 files/digest-openldap-2.3.19 723
-MD5 e88ad429724735e30654da089190d683 files/digest-openldap-2.3.20 723
-RMD160 eb910604d9eb3523b825f1e2c9ddc39161953c10 files/digest-openldap-2.3.20 723
-SHA256 7e0d5949558027c8304b9732dc9476e45815b6401103a457762291c729d1b3f4 files/digest-openldap-2.3.20 723
-MD5 89ce9849e81c7760fc9c32c8239f6b1b files/digest-openldap-2.3.21 241
-RMD160 fd85d267b554c255aea32edf92a44c1046443cce files/digest-openldap-2.3.21 241
-SHA256 e00ac18f0faf58d41a73109775715224d49093c682e31cf0d3236468918974c7 files/digest-openldap-2.3.21 241
+AUX gencert.sh 3505 RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf SHA1 c725139698999415a7076b369222172949c2635f SHA256 73f1f7f0d76132da878ae8739f4f4403bb5f17d630ffa109fe4b1645e7f073c6 size 3505
 MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
 RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf files/gencert.sh 3505
 SHA256 73f1f7f0d76132da878ae8739f4f4403bb5f17d630ffa109fe4b1645e7f073c6 files/gencert.sh 3505
+AUX gencert.sh-2.2.27 2939 RMD160 fa7501bec63ea372904a215d7ae44d2ad9c99e23 SHA1 9e82bdfa35440c3a46481192d936d1c258ff642f SHA256 517884e873390eabbaf7d13880d1a676e2cb384331a9c65e3301ca6ac3642693 size 2939
 MD5 c16eada85fafe1c17bf0089d0ef90ae3 files/gencert.sh-2.2.27 2939
 RMD160 fa7501bec63ea372904a215d7ae44d2ad9c99e23 files/gencert.sh-2.2.27 2939
 SHA256 517884e873390eabbaf7d13880d1a676e2cb384331a9c65e3301ca6ac3642693 files/gencert.sh-2.2.27 2939
+AUX openldap-2.1.27-db40.patch 718 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 SHA1 9a6a9fb9608a1abfbafa3a4e4915d67e8e36ec4c SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53 size 718
 MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 files/openldap-2.1.27-db40.patch 718
 SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53 files/openldap-2.1.27-db40.patch 718
+AUX openldap-2.1.27-perlthreadsfix.patch 967 RMD160 560fff078d5a446519164881bd25e8dfaaf39f69 SHA1 e4be7942cd2f54c83ba5cbe92d1e35e540b29dfb SHA256 4798278284ab6ccd768594db18a56525a34f7d8c890a5f2198b2542573173fcf size 967
 MD5 ca2c43219df88502aafeab9db9eda4d5 files/openldap-2.1.27-perlthreadsfix.patch 967
 RMD160 560fff078d5a446519164881bd25e8dfaaf39f69 files/openldap-2.1.27-perlthreadsfix.patch 967
 SHA256 4798278284ab6ccd768594db18a56525a34f7d8c890a5f2198b2542573173fcf files/openldap-2.1.27-perlthreadsfix.patch 967
+AUX openldap-2.1.30-autoconf-archived-fix.patch 1912 RMD160 e2ecd27a8dac980903804cc0cbc9210fb0cabe18 SHA1 0522ce713b8153f42550eb90d71cb1927d0e97da SHA256 52e82990d4c93499e1a53d533921732979cd1dfc3119db48eedd525a4ea79e2f size 1912
 MD5 b51f63396bab5123f8b24674ed4481b2 files/openldap-2.1.30-autoconf-archived-fix.patch 1912
 RMD160 e2ecd27a8dac980903804cc0cbc9210fb0cabe18 files/openldap-2.1.30-autoconf-archived-fix.patch 1912
 SHA256 52e82990d4c93499e1a53d533921732979cd1dfc3119db48eedd525a4ea79e2f files/openldap-2.1.30-autoconf-archived-fix.patch 1912
+AUX openldap-2.1.30-autoconf25.patch 382 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 SHA1 c9ea3892c092afde74cfed622b54ce6ac5e69a3a SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 size 382
 MD5 14cfcdbe422004e2e42bfb14cea16a5e files/openldap-2.1.30-autoconf25.patch 382
 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 files/openldap-2.1.30-autoconf25.patch 382
 SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 files/openldap-2.1.30-autoconf25.patch 382
+AUX openldap-2.1.30-db40.patch 718 RMD160 13d21287d7ad881ba28d42deea507dbe973a0d5b SHA1 628624f9c3f6980759fda65676438d35acfb2620 SHA256 4c68a8b052968dd9b7fc823144fd3f2b0b1d686ce5d8899d27ad3e8d99301cc2 size 718
 MD5 c58db81c8d7084a9abf48747134da0a8 files/openldap-2.1.30-db40.patch 718
 RMD160 13d21287d7ad881ba28d42deea507dbe973a0d5b files/openldap-2.1.30-db40.patch 718
 SHA256 4c68a8b052968dd9b7fc823144fd3f2b0b1d686ce5d8899d27ad3e8d99301cc2 files/openldap-2.1.30-db40.patch 718
+AUX openldap-2.1.30-m4_underquoted.patch 3916 RMD160 8190e85d91c3f6e64ceed786581615c765176a4d SHA1 0b63f3b5f082dddf56841513802d97c0e0edbab0 SHA256 b48f5a56ce2f26d117d8ca491bb22229fc25d05808bef1c1fabc98b5164d87d0 size 3916
 MD5 a240004c097944335b15bcb489661c2c files/openldap-2.1.30-m4_underquoted.patch 3916
 RMD160 8190e85d91c3f6e64ceed786581615c765176a4d files/openldap-2.1.30-m4_underquoted.patch 3916
 SHA256 b48f5a56ce2f26d117d8ca491bb22229fc25d05808bef1c1fabc98b5164d87d0 files/openldap-2.1.30-m4_underquoted.patch 3916
+AUX openldap-2.1.30-rpath.patch 13131 RMD160 e2e2e2e0a244a1265e5af821499762c7bf7194a8 SHA1 329d550198818b578f29c80f8bd98e9be9164398 SHA256 7f0f65f5837c67613953e06793a23b1580481b7ee5bb56020f31061a4d46cbd6 size 13131
 MD5 07a689148742f0fd74dcedf572a8f092 files/openldap-2.1.30-rpath.patch 13131
 RMD160 e2e2e2e0a244a1265e5af821499762c7bf7194a8 files/openldap-2.1.30-rpath.patch 13131
 SHA256 7f0f65f5837c67613953e06793a23b1580481b7ee5bb56020f31061a4d46cbd6 files/openldap-2.1.30-rpath.patch 13131
+AUX openldap-2.1.30-tests.patch 378 RMD160 c3a64faa592be085166a44b7acd3095f7f5dcb2d SHA1 28d673c2162695adc2c363c19069fcaf4e92dc9d SHA256 bace9ce39bba49d55b2b9aa52518acb193ff507ebe4f9cdb39c5d713daa755c9 size 378
 MD5 c3c348e2e475de1b8f04c674aa15d27e files/openldap-2.1.30-tests.patch 378
 RMD160 c3a64faa592be085166a44b7acd3095f7f5dcb2d files/openldap-2.1.30-tests.patch 378
 SHA256 bace9ce39bba49d55b2b9aa52518acb193ff507ebe4f9cdb39c5d713daa755c9 files/openldap-2.1.30-tests.patch 378
+AUX openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122 RMD160 1c39aa073ffb1616d2542e8a949f50d54f765635 SHA1 dbbf04d7d0646be5e0e31ef5bf908bf5e38cf500 SHA256 9daf88287cc0a0a62817b3d765fdc0eb64abf931b46b11c03f6f91b0ccc5172f size 1122
 MD5 1afdae6ce6fa709abed41ce45f41f5e8 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
 RMD160 1c39aa073ffb1616d2542e8a949f50d54f765635 files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
 SHA256 9daf88287cc0a0a62817b3d765fdc0eb64abf931b46b11c03f6f91b0ccc5172f files/openldap-2.1.30-tls-activedirectory-hang-fix.patch 1122
+AUX openldap-2.1.30-ximian_connector.patch 6435 RMD160 5e33c988ad0d26596d6ed6f130edcace9c8dec77 SHA1 73b6363cb1022785f5911e07222ff570f71a8c27 SHA256 fed7526974d1d17df5bdfc69cbc23191e519041840b8c914a79a09e7804b6e94 size 6435
 MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patch 6435
 RMD160 5e33c988ad0d26596d6ed6f130edcace9c8dec77 files/openldap-2.1.30-ximian_connector.patch 6435
 SHA256 fed7526974d1d17df5bdfc69cbc23191e519041840b8c914a79a09e7804b6e94 files/openldap-2.1.30-ximian_connector.patch 6435
+AUX openldap-2.2.14-db40.patch 773 RMD160 de210089942e6effeb0fa272296cc72c64480418 SHA1 5db78bfdded7cc0f7ae0e9831e0fedd68b66aae4 SHA256 8cd763aecaa0c81fe510b20bad348a9541bd6e85e2cd131239d27968c3110dec size 773
 MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
 RMD160 de210089942e6effeb0fa272296cc72c64480418 files/openldap-2.2.14-db40.patch 773
 SHA256 8cd763aecaa0c81fe510b20bad348a9541bd6e85e2cd131239d27968c3110dec files/openldap-2.2.14-db40.patch 773
+AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 size 614
 MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 files/openldap-2.2.14-perlthreadsfix.patch 614
 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 files/openldap-2.2.14-perlthreadsfix.patch 614
+AUX openldap-2.2.26-tls-fix-connection-test.patch 663 RMD160 8a076e406e95dd6a9e64aafd2ce32b40e63f5389 SHA1 243a9b32d085beec8f63ed5c8b85177f2b5e8946 SHA256 9a0995a0075c0067cc20fefeb1080a9c2767f16d8efe1ca73ec072649f297a76 size 663
 MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
 RMD160 8a076e406e95dd6a9e64aafd2ce32b40e63f5389 files/openldap-2.2.26-tls-fix-connection-test.patch 663
 SHA256 9a0995a0075c0067cc20fefeb1080a9c2767f16d8efe1ca73ec072649f297a76 files/openldap-2.2.26-tls-fix-connection-test.patch 663
+AUX openldap-2.2.28-autoconf-archived-fix.patch 2001 RMD160 183e1d364f98e906d643ecbf81a3049ab3590844 SHA1 392b709e92e61e60b32ed013f1362df814667c6e SHA256 8bf925033a625842c31f69ba66a2a62d5c7eb09478951e574496c0bd43a8d1db size 2001
 MD5 f92be2e2c3b130cc9ff6ff738165e40e files/openldap-2.2.28-autoconf-archived-fix.patch 2001
 RMD160 183e1d364f98e906d643ecbf81a3049ab3590844 files/openldap-2.2.28-autoconf-archived-fix.patch 2001
 SHA256 8bf925033a625842c31f69ba66a2a62d5c7eb09478951e574496c0bd43a8d1db files/openldap-2.2.28-autoconf-archived-fix.patch 2001
+AUX openldap-2.2.28-cleartext-passwords.patch 1497 RMD160 49bbb0364b349d84e9d60eca8957bad7a7fbef61 SHA1 cac15b91305b79cdb6e83d771386d642c71d18b5 SHA256 46feb1eec1c92c9b45082f594526a9e67f72a62980153d6c03616e020db29b5c size 1497
 MD5 c0b486ddc5a55fa4879cec74e9a11748 files/openldap-2.2.28-cleartext-passwords.patch 1497
 RMD160 49bbb0364b349d84e9d60eca8957bad7a7fbef61 files/openldap-2.2.28-cleartext-passwords.patch 1497
 SHA256 46feb1eec1c92c9b45082f594526a9e67f72a62980153d6c03616e020db29b5c files/openldap-2.2.28-cleartext-passwords.patch 1497
+AUX openldap-2.2.28-r1-configure.in-rpath.patch 382 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 SHA1 c9ea3892c092afde74cfed622b54ce6ac5e69a3a SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 size 382
 MD5 14cfcdbe422004e2e42bfb14cea16a5e files/openldap-2.2.28-r1-configure.in-rpath.patch 382
 RMD160 1c2dbcd122e86487098ac8d563896aa1002b9238 files/openldap-2.2.28-r1-configure.in-rpath.patch 382
 SHA256 aa43c6d8fa15e31b75243580ebc0d10e41975ba658c0b8bb534df15e11503df5 files/openldap-2.2.28-r1-configure.in-rpath.patch 382
+AUX openldap-2.2.28-tests.patch 385 RMD160 a37869af6204e294d58b613f80300c8b57c4a934 SHA1 13f5cff50c21e994d478eecb2d493d0d411a4769 SHA256 d493bfce2cbb9958416b8c90053f56183de46dc1965c5c16cb3586aabef6beb6 size 385
 MD5 91f97e6962d63d9a7f12697ff34772f7 files/openldap-2.2.28-tests.patch 385
 RMD160 a37869af6204e294d58b613f80300c8b57c4a934 files/openldap-2.2.28-tests.patch 385
 SHA256 d493bfce2cbb9958416b8c90053f56183de46dc1965c5c16cb3586aabef6beb6 files/openldap-2.2.28-tests.patch 385
+AUX openldap-2.2.28-ximian_connector.patch 5669 RMD160 a099ae0fbcd52b3b5ddf6450374ffaaff1c0d4b9 SHA1 c526fa88e45e7f9b9dc51f7bace5ff086a13b5b8 SHA256 6ac33c6ca0da7b24070402dfa6bafbe6ad44561141fbba9f22f842fce1636968 size 5669
 MD5 f940f4e9ac544ed0a0f28b87df5cd2c8 files/openldap-2.2.28-ximian_connector.patch 5669
 RMD160 a099ae0fbcd52b3b5ddf6450374ffaaff1c0d4b9 files/openldap-2.2.28-ximian_connector.patch 5669
 SHA256 6ac33c6ca0da7b24070402dfa6bafbe6ad44561141fbba9f22f842fce1636968 files/openldap-2.2.28-ximian_connector.patch 5669
+AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243 size 5011
 MD5 7d80c3708d5940a3b7a428740af863d0 files/openldap-2.2.6-ntlm.patch 5011
 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be files/openldap-2.2.6-ntlm.patch 5011
 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243 files/openldap-2.2.6-ntlm.patch 5011
-MD5 e630c2183fdc9397de2386d887a0e252 metadata.xml 503
-RMD160 7888826d012217d4828733015fc1b62d95beb1c1 metadata.xml 503
-SHA256 c1f00d159c21df00306e0e709497f6053901ccf3c43fa6187871df3045f64177 metadata.xml 503
+DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831 SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 size 2044673
+DIST openldap-2.2.23.tgz 2600908 RMD160 fc34d3f874d3976e4f8902820190dceda8d940c5 SHA256 303ae734d343f54228e6745d7660be2a46ecb7e6cd27199e027535dd35a63b14 size 2600908
+DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba size 2630427
+DIST openldap-2.3.21.tgz 3750778 RMD160 8fb7bce91452e24a8bd5e23f6dd3d17a3b2711cf SHA256 12204e82276036742f4595122ca2c4ca173e7144a449f1d6d4950273c94a0ef5 size 3750778
+EBUILD openldap-2.1.30-r2.ebuild 7483 RMD160 d58d6170eb26b2528ad2cfc39e0a098f9972ac77 SHA1 ea936d856c31b7c8704a4afe96adce32d65c2392 SHA256 eea4e345aebb4ddfbe77facba80b6ae0dafbacfdc1f45f84a0286f893c341d9d size 7483
 MD5 943899d61dff15e7eb2ff62409814b49 openldap-2.1.30-r2.ebuild 7483
 RMD160 d58d6170eb26b2528ad2cfc39e0a098f9972ac77 openldap-2.1.30-r2.ebuild 7483
 SHA256 eea4e345aebb4ddfbe77facba80b6ae0dafbacfdc1f45f84a0286f893c341d9d openldap-2.1.30-r2.ebuild 7483
+EBUILD openldap-2.1.30-r5.ebuild 7628 RMD160 ea0ac3e3db03fb6104ab74887a6047dac9d64fc9 SHA1 29d714669b101c1b5f568aaef0d599a48cf506ed SHA256 4a7f686b9596c8a6304b36679d0a9802f4721071a870edde2717585c03d812d2 size 7628
 MD5 2950a8442733483861d191c433359f59 openldap-2.1.30-r5.ebuild 7628
 RMD160 ea0ac3e3db03fb6104ab74887a6047dac9d64fc9 openldap-2.1.30-r5.ebuild 7628
 SHA256 4a7f686b9596c8a6304b36679d0a9802f4721071a870edde2717585c03d812d2 openldap-2.1.30-r5.ebuild 7628
+EBUILD openldap-2.1.30-r6.ebuild 8137 RMD160 56b99580fa06781f9268dce9983a0e77a3d83814 SHA1 fadb0d07f2b0093a342aae4857b75be3211293cd SHA256 76d6008dc79ffd9a44aaa7eb35b50ad13fd82bb80c3e095d6e2b88b26ec52e86 size 8137
 MD5 80349b77cb15c3fcae8812961ade31a2 openldap-2.1.30-r6.ebuild 8137
 RMD160 56b99580fa06781f9268dce9983a0e77a3d83814 openldap-2.1.30-r6.ebuild 8137
 SHA256 76d6008dc79ffd9a44aaa7eb35b50ad13fd82bb80c3e095d6e2b88b26ec52e86 openldap-2.1.30-r6.ebuild 8137
+EBUILD openldap-2.1.30-r7.ebuild 8904 RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 SHA1 b3e6eee160ef78ee0c13b274aceb3acf60fa8ae2 SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28 size 8904
 MD5 41ddaae1efa5f62acef48fd20236b9e0 openldap-2.1.30-r7.ebuild 8904
 RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 openldap-2.1.30-r7.ebuild 8904
 SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28 openldap-2.1.30-r7.ebuild 8904
+EBUILD openldap-2.2.23-r1.ebuild 8793 RMD160 1e04523d6d4b394f1e0b2957b8fc72dc771c2760 SHA1 ebe6e600b97ec5719dbeb9d12cb235a2a09af0b8 SHA256 58948e6507ff5688fd2fc34db9d7336b50d34c975cc7368af2f132f85d957d57 size 8793
 MD5 67e977f2927e78c29f4020adba7f6b5b openldap-2.2.23-r1.ebuild 8793
 RMD160 1e04523d6d4b394f1e0b2957b8fc72dc771c2760 openldap-2.2.23-r1.ebuild 8793
 SHA256 58948e6507ff5688fd2fc34db9d7336b50d34c975cc7368af2f132f85d957d57 openldap-2.2.23-r1.ebuild 8793
+EBUILD openldap-2.2.28-r3.ebuild 13718 RMD160 26343fa10b9a81745f73fc065fd51fbee6ce299a SHA1 ca9de851c686332af55ea78ff9e93596e43fd7d2 SHA256 dbbaa4d1c5e893e5901c9e6c7c647b297e67f8aee3c08e45fd3e05d9483ca851 size 13718
 MD5 c7031bc6d8bb700d5bb5daee1d13db91 openldap-2.2.28-r3.ebuild 13718
 RMD160 26343fa10b9a81745f73fc065fd51fbee6ce299a openldap-2.2.28-r3.ebuild 13718
 SHA256 dbbaa4d1c5e893e5901c9e6c7c647b297e67f8aee3c08e45fd3e05d9483ca851 openldap-2.2.28-r3.ebuild 13718
+EBUILD openldap-2.2.28-r4.ebuild 14856 RMD160 cee7261ad9b819187e0a96e4db57ac33f7cc9567 SHA1 ab2d7657adc476d5cb7eb156d1c0c999799caaad SHA256 da400cd6cf66d08911b831a71507c86827ac924521cd9d384bb93fcae489acf5 size 14856
 MD5 bfbb723e1d3af9439454c3e320feb0d0 openldap-2.2.28-r4.ebuild 14856
 RMD160 cee7261ad9b819187e0a96e4db57ac33f7cc9567 openldap-2.2.28-r4.ebuild 14856
 SHA256 da400cd6cf66d08911b831a71507c86827ac924521cd9d384bb93fcae489acf5 openldap-2.2.28-r4.ebuild 14856
-MD5 4b8833730789a3f12304da3ef4bc1a89 openldap-2.3.18.ebuild 17221
-RMD160 0bb62cd19f29cbbf68d63b64bf685e49afa22e76 openldap-2.3.18.ebuild 17221
-SHA256 881c619b97f8a6138614c63fc9dd3bc4dd41a689b8c6760c2004683f8c52e20d openldap-2.3.18.ebuild 17221
-MD5 14b6e838e56f528d1805580c50a66490 openldap-2.3.19.ebuild 17221
-RMD160 f616f10134ad9a3a205d712cae2dd5ca05d50175 openldap-2.3.19.ebuild 17221
-SHA256 fed3d8a08266e0cf2c0a839ab0152ec6c035ce7a55b02cbb801375b0895bbce5 openldap-2.3.19.ebuild 17221
-MD5 53441422dc86904c29687b8bcedc6d82 openldap-2.3.20.ebuild 17221
-RMD160 fbd2096c011c5aee025682c09825a7f843ab8930 openldap-2.3.20.ebuild 17221
-SHA256 220fee4445b7535b3ac2891e0558bc5af781a191f236e578a727b598961938e1 openldap-2.3.20.ebuild 17221
-MD5 098e5800a07d047c28a9346913bf6cc2 openldap-2.3.21.ebuild 12692
-RMD160 d6b0677d592e505f9bfce7dc253d7ec56d6d2d55 openldap-2.3.21.ebuild 12692
-SHA256 55da27efaa3785d1b0793562f2dacab65de662bb63473a494c2437937d9a43c4 openldap-2.3.21.ebuild 12692
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFERzCfAiZjviIA2XgRAnfnAKC4G2UwUa3yVGuCwzdIJ4dNDVGENgCgn3nc
-6Tt5lS+UOlnO9PeEkcKckMw=
-=gpnc
------END PGP SIGNATURE-----
+EBUILD openldap-2.3.21.ebuild 12848 RMD160 707e96c44c545e97fb71cc151e2fb55b800de022 SHA1 d029c4bd9f2bd18f7e22c105ee10e912366f835e SHA256 9f02d343a95b54117ee3659aaa54ba90bd04860bffb1f9724f5839aa20369b90 size 12848
+MD5 1bb2ac2f0e58499b26e74a9d63e87df4 openldap-2.3.21.ebuild 12848
+RMD160 707e96c44c545e97fb71cc151e2fb55b800de022 openldap-2.3.21.ebuild 12848
+SHA256 9f02d343a95b54117ee3659aaa54ba90bd04860bffb1f9724f5839aa20369b90 openldap-2.3.21.ebuild 12848
+MISC ChangeLog 30645 RMD160 3b51c95610506eb53573a52fb179efc1d0e8824b SHA1 4de5b88d614ee2e9f84e12cb85cb043976a5299c SHA256 c29f1072ce7469f404746933a57f0ee6c1ac460debbf9c1cbc81dd39c213c4a2 size 30645
+MD5 9d9a7a23b567fe45958ec0f48b869414 ChangeLog 30645
+RMD160 3b51c95610506eb53573a52fb179efc1d0e8824b ChangeLog 30645
+SHA256 c29f1072ce7469f404746933a57f0ee6c1ac460debbf9c1cbc81dd39c213c4a2 ChangeLog 30645
+MISC metadata.xml 503 RMD160 7888826d012217d4828733015fc1b62d95beb1c1 SHA1 aa81832c2d31f74e3d82978b127e039955de05e6 SHA256 c1f00d159c21df00306e0e709497f6053901ccf3c43fa6187871df3045f64177 size 503
+MD5 e630c2183fdc9397de2386d887a0e252 metadata.xml 503
+RMD160 7888826d012217d4828733015fc1b62d95beb1c1 metadata.xml 503
+SHA256 c1f00d159c21df00306e0e709497f6053901ccf3c43fa6187871df3045f64177 metadata.xml 503
+MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r2 241
+RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r2 241
+SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r2 241
+MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r5 241
+RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r5 241
+SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r5 241
+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 53cbc4c51f8a94dd0a63de1720ab8d0f files/digest-openldap-2.2.23-r1 241
+RMD160 fff59d5410606841b9171605497a59daa1271d1b files/digest-openldap-2.2.23-r1 241
+SHA256 fbb35dd6189e32c2dd4f5842bc8471d4c9cecc94f7866f9a3c69556c01817544 files/digest-openldap-2.2.23-r1 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 89ce9849e81c7760fc9c32c8239f6b1b files/digest-openldap-2.3.21 241
+RMD160 fd85d267b554c255aea32edf92a44c1046443cce files/digest-openldap-2.3.21 241
+SHA256 e00ac18f0faf58d41a73109775715224d49093c682e31cf0d3236468918974c7 files/digest-openldap-2.3.21 241
diff --git a/net-nds/openldap/files/digest-openldap-2.3.18 b/net-nds/openldap/files/digest-openldap-2.3.18
deleted file mode 100644
index fe10f33a9716..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.18
+++ /dev/null
@@ -1,7 +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
-MD5 ebef4d924fb6b585f88c75d03c260889 openldap-2.3.18.tgz 3707863
diff --git a/net-nds/openldap/files/digest-openldap-2.3.19 b/net-nds/openldap/files/digest-openldap-2.3.19
deleted file mode 100644
index 4a3b7f25961e..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.19
+++ /dev/null
@@ -1,9 +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
-MD5 867ee197df0e4432fa00f2439e6094f6 openldap-2.3.19.tgz 3709244
-RMD160 46680874f6230465bd9562a3e9e78525a7140baf openldap-2.3.19.tgz 3709244
-SHA256 cb58e741e6bdaed953af67cac726943436138fbe90b98c665557e77430f64cc3 openldap-2.3.19.tgz 3709244
diff --git a/net-nds/openldap/files/digest-openldap-2.3.20 b/net-nds/openldap/files/digest-openldap-2.3.20
deleted file mode 100644
index f030728157c8..000000000000
--- a/net-nds/openldap/files/digest-openldap-2.3.20
+++ /dev/null
@@ -1,9 +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
-MD5 49d2c5b9378a7b57e1fb03948acb8e32 openldap-2.3.20.tgz 3732780
-RMD160 89b54d32c93f91df245505ed37978384bc0e2098 openldap-2.3.20.tgz 3732780
-SHA256 f969bfded4506c1d2b424036eb80e22f0b96591d7c8a833870704fdef200d255 openldap-2.3.20.tgz 3732780
diff --git a/net-nds/openldap/openldap-2.3.18.ebuild b/net-nds/openldap/openldap-2.3.18.ebuild
deleted file mode 100644
index d3fd5f1ab73e..000000000000
--- a/net-nds/openldap/openldap-2.3.18.ebuild
+++ /dev/null
@@ -1,473 +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.18.ebuild,v 1.2 2006/03/09 23:49:16 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-COMPAT21_PV="2.1.30"
-COMPAT21_P="${PN}-${COMPAT21_PV}"
-COMPAT21_S="${WORKDIR}/${COMPAT21_P}"
-
-COMPAT22_PV="2.2.28"
-COMPAT22_P="${PN}-${COMPAT22_PV}"
-COMPAT22_S="${WORKDIR}/${COMPAT22_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/${COMPAT21_P}.tgz
-		mirror://openldap/openldap-release/${COMPAT22_P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba
-	sasl selinux slp ssl tcpd"
-
-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 )
-	selinux? ( sec-policy/selinux-openldap )
-	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} )
-	)"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
-
-openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1 or 2.2, 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 in 2.3:"
-	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo
-	ewarn "The libraries of 2.1 and 2.2 are provided but please"
-	ewarn "consider updating your applications to only use 2.3"
-	ewarn "as the backwards compatible libraries will be removed in future."
-	ewarn "Do rebuild your applications against the new libraries do:"
-	ewarn "# revdep-rebuild --library liblber.so.2"
-	ewarn "# revdep-rebuild --library libldap.so.2"
-	ewarn "# revdep-rebuild --library libldap_r.so.2"
-	echo
-	ewarn "Note that there are substantial changes to how openldap functions"
-	ewarn "in 2.3, if you are using bdb as a backend. You should issue the"
-	ewarn "following commands in order to get openldap to run:"
-	ewarn "mkdir /etc/openldap"
-	ewarn "slaptest -f /etc/openldap/slapd.conf -F /etc/openldap/slapd.d"
-	ewarn "chown -R ldap:ldap /etc/openldap/slapd.d"
-	ewarn "Make sure that '-F /etc/openldap/slapd.d' is included in the"
-	ewarn "/etc/conf.d/slapd configuration file. While it is possible to"
-	ewarn "skip the slaptest line above, it is inadvisable to do so as by"
-	ewarn "using slaptest you are able to resolve any configuration syntax"
-	ewarn "changes that might be present, however, if you are sure that"
-	ewarn "your syntax will work for 2.3 then you may simply create the"
-	ewarn "directory, set the permissions and ensure that the"
-	ewarn "/etc/conf.d/slapd has the extra information in it and"
-	ewarn "openldap will automatically create the new directory structure"
-	ewarn "and populate it with data."
-	echo
-}
-
-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.3' && [ -n "$datafiles" ]; then
-		eerror "A possible old installation of OpenLDAP was detected"
-		eerror "As major version upgrades to 2.3 from lower versions can corrupt your"
-		eerror "database, 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.2*'"
-		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data.old/"
-		eerror " 6. emerge '>=net-nds/openldap-2.3'"
-		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."
-		die "Warning direct upgrade unsafe!"
-	fi
-	openldap_upgrade_warning
-	if use perl && 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
-
-	# Fixes for 2.3
-	einfo "Applying patches for 2.3"
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# fixes for 2.2
-	einfo "Applying patches for 2.2 compat lib"
-
-	# 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 ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-r1-configure.in-rpath.patch
-
-	# fixes for 2.1
-	einfo "Applying patches for 2.1 compat lib"
-
-	# 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-db40.patch
-	EPATCH_OPTS="-p1 -d ${COMPAT21_S}" 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
-
-	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	# reconf compat for RPATH solve (bug #105380)
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-
-		# ensure correct SLAPI path by default
-		sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-			${LOCAL_S}/include/ldap_defaults.h
-
-		cd ${LOCAL_S}
-		einfo "Running libtoolize on ${each}"
-		libtoolize --copy --force --automake
-		einfo "Running aclocal on ${each}"
-		aclocal || die "aclocal failed"
-
-		# apply RPATH patch
-		EPATCH_OPTS="-p0 -d ${LOCAL_S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-
-		einfo "Running autoconf on ${each}"
-		autoconf || die "autoconf failed"
-	done
-}
-
-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
-	# slurpd is deprecated by syncrepl in 2.3
-	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"
-		# repeat? - is there a reason for this?
-		#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 libs
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-		cd ${LOCAL_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 for ${each} failed"
-		make depend || die "make depend on ${each} failed"
-		cd ${LOCAL_S}/libraries/liblber && make liblber.la || die "make for ${each} liblber.la failed"
-		cd ${LOCAL_S}/libraries/libldap && make libldap.la || die "make for ${each}libldap.la failed"
-		cd ${LOCAL_S}/libraries/libldap_r && make libldap_r.la || die "make for ${each} libldap_r.la failed"
-	done
-}
-
-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
-
-	if ! use nocompat; then
-	    dolib.so ${COMPAT21_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
-	    die "failed to install 2.1 liblber"
-	    dolib.so ${COMPAT21_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
-	    die "failed to install 2.1 libldap"
-	    dolib.so ${COMPAT21_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
-	    die "failed to install 2.1 libldap_r"
-
-	    dolib.so ${COMPAT22_S}/libraries/liblber/.libs/liblber-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 liblber"
-	    dosym liblber-2.2.so.7.0.21 /usr/$(get_libdir)/liblber-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap/.libs/libldap-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap"
-	    dosym libldap-2.2.so.7.0.21 /usr/$(get_libdir)/libldap-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap_r/.libs/libldap_r-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap_r"
-	    dosym libldap_r-2.2.so.7.0.21 /usr/$(get_libdir)/libldap_r-2.2.so.7
-	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{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-
-	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
-	ewarn "See Berkeley Database tuning options for OpenLDAP at http://www.openldap.org/faq/data/cache/1072.html"
-
-	einfo "Please note there is an example BDB configuration file in"
-	einfo "/etc/openldap and /var/lib/openldap-data. Review these config"
-	einfo "files for possible performance enhancements."
-	einfo
-	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)"
-}
diff --git a/net-nds/openldap/openldap-2.3.19.ebuild b/net-nds/openldap/openldap-2.3.19.ebuild
deleted file mode 100644
index fa43c476d1bc..000000000000
--- a/net-nds/openldap/openldap-2.3.19.ebuild
+++ /dev/null
@@ -1,473 +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.19.ebuild,v 1.2 2006/03/09 23:49:16 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-COMPAT21_PV="2.1.30"
-COMPAT21_P="${PN}-${COMPAT21_PV}"
-COMPAT21_S="${WORKDIR}/${COMPAT21_P}"
-
-COMPAT22_PV="2.2.28"
-COMPAT22_P="${PN}-${COMPAT22_PV}"
-COMPAT22_S="${WORKDIR}/${COMPAT22_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/${COMPAT21_P}.tgz
-		mirror://openldap/openldap-release/${COMPAT22_P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba
-	sasl selinux slp ssl tcpd"
-
-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 )
-	selinux? ( sec-policy/selinux-openldap )
-	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} )
-	)"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
-
-openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1 or 2.2, 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 in 2.3:"
-	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo
-	ewarn "The libraries of 2.1 and 2.2 are provided but please"
-	ewarn "consider updating your applications to only use 2.3"
-	ewarn "as the backwards compatible libraries will be removed in future."
-	ewarn "Do rebuild your applications against the new libraries do:"
-	ewarn "# revdep-rebuild --library liblber.so.2"
-	ewarn "# revdep-rebuild --library libldap.so.2"
-	ewarn "# revdep-rebuild --library libldap_r.so.2"
-	echo
-	ewarn "Note that there are substantial changes to how openldap functions"
-	ewarn "in 2.3, if you are using bdb as a backend. You should issue the"
-	ewarn "following commands in order to get openldap to run:"
-	ewarn "mkdir /etc/openldap"
-	ewarn "slaptest -f /etc/openldap/slapd.conf -F /etc/openldap/slapd.d"
-	ewarn "chown -R ldap:ldap /etc/openldap/slapd.d"
-	ewarn "Make sure that '-F /etc/openldap/slapd.d' is included in the"
-	ewarn "/etc/conf.d/slapd configuration file. While it is possible to"
-	ewarn "skip the slaptest line above, it is inadvisable to do so as by"
-	ewarn "using slaptest you are able to resolve any configuration syntax"
-	ewarn "changes that might be present, however, if you are sure that"
-	ewarn "your syntax will work for 2.3 then you may simply create the"
-	ewarn "directory, set the permissions and ensure that the"
-	ewarn "/etc/conf.d/slapd has the extra information in it and"
-	ewarn "openldap will automatically create the new directory structure"
-	ewarn "and populate it with data."
-	echo
-}
-
-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.3' && [ -n "$datafiles" ]; then
-		eerror "A possible old installation of OpenLDAP was detected"
-		eerror "As major version upgrades to 2.3 from lower versions can corrupt your"
-		eerror "database, 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.2*'"
-		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data.old/"
-		eerror " 6. emerge '>=net-nds/openldap-2.3'"
-		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."
-		die "Warning direct upgrade unsafe!"
-	fi
-	openldap_upgrade_warning
-	if use perl && 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
-
-	# Fixes for 2.3
-	einfo "Applying patches for 2.3"
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# fixes for 2.2
-	einfo "Applying patches for 2.2 compat lib"
-
-	# 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 ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-r1-configure.in-rpath.patch
-
-	# fixes for 2.1
-	einfo "Applying patches for 2.1 compat lib"
-
-	# 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-db40.patch
-	EPATCH_OPTS="-p1 -d ${COMPAT21_S}" 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
-
-	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	# reconf compat for RPATH solve (bug #105380)
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-
-		# ensure correct SLAPI path by default
-		sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-			${LOCAL_S}/include/ldap_defaults.h
-
-		cd ${LOCAL_S}
-		einfo "Running libtoolize on ${each}"
-		libtoolize --copy --force --automake
-		einfo "Running aclocal on ${each}"
-		aclocal || die "aclocal failed"
-
-		# apply RPATH patch
-		EPATCH_OPTS="-p0 -d ${LOCAL_S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-
-		einfo "Running autoconf on ${each}"
-		autoconf || die "autoconf failed"
-	done
-}
-
-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
-	# slurpd is deprecated by syncrepl in 2.3
-	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"
-		# repeat? - is there a reason for this?
-		#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 libs
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-		cd ${LOCAL_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 for ${each} failed"
-		make depend || die "make depend on ${each} failed"
-		cd ${LOCAL_S}/libraries/liblber && make liblber.la || die "make for ${each} liblber.la failed"
-		cd ${LOCAL_S}/libraries/libldap && make libldap.la || die "make for ${each}libldap.la failed"
-		cd ${LOCAL_S}/libraries/libldap_r && make libldap_r.la || die "make for ${each} libldap_r.la failed"
-	done
-}
-
-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
-
-	if ! use nocompat; then
-	    dolib.so ${COMPAT21_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
-	    die "failed to install 2.1 liblber"
-	    dolib.so ${COMPAT21_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
-	    die "failed to install 2.1 libldap"
-	    dolib.so ${COMPAT21_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
-	    die "failed to install 2.1 libldap_r"
-
-	    dolib.so ${COMPAT22_S}/libraries/liblber/.libs/liblber-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 liblber"
-	    dosym liblber-2.2.so.7.0.21 /usr/$(get_libdir)/liblber-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap/.libs/libldap-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap"
-	    dosym libldap-2.2.so.7.0.21 /usr/$(get_libdir)/libldap-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap_r/.libs/libldap_r-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap_r"
-	    dosym libldap_r-2.2.so.7.0.21 /usr/$(get_libdir)/libldap_r-2.2.so.7
-	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{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-
-	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
-	ewarn "See Berkeley Database tuning options for OpenLDAP at http://www.openldap.org/faq/data/cache/1072.html"
-
-	einfo "Please note there is an example BDB configuration file in"
-	einfo "/etc/openldap and /var/lib/openldap-data. Review these config"
-	einfo "files for possible performance enhancements."
-	einfo
-	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)"
-}
diff --git a/net-nds/openldap/openldap-2.3.20.ebuild b/net-nds/openldap/openldap-2.3.20.ebuild
deleted file mode 100644
index f61c888be5e4..000000000000
--- a/net-nds/openldap/openldap-2.3.20.ebuild
+++ /dev/null
@@ -1,473 +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.20.ebuild,v 1.2 2006/03/09 23:49:16 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-COMPAT21_PV="2.1.30"
-COMPAT21_P="${PN}-${COMPAT21_PV}"
-COMPAT21_S="${WORKDIR}/${COMPAT21_P}"
-
-COMPAT22_PV="2.2.28"
-COMPAT22_P="${PN}-${COMPAT22_PV}"
-COMPAT22_S="${WORKDIR}/${COMPAT22_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/${COMPAT21_P}.tgz
-		mirror://openldap/openldap-release/${COMPAT22_P}.tgz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba
-	sasl selinux slp ssl tcpd"
-
-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 )
-	selinux? ( sec-policy/selinux-openldap )
-	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} )
-	)"
-
-DEPEND="${RDEPEND}
-		>=sys-devel/libtool-1.5.18-r1
-		>=sys-apps/sed-4"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
-
-openldap_upgrade_warning() {
-	ewarn "If you are upgrading from OpenLDAP-2.1 or 2.2, 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 in 2.3:"
-	ewarn "'access to attribute=' is now 'access to attrs='"
-	echo
-	ewarn "The libraries of 2.1 and 2.2 are provided but please"
-	ewarn "consider updating your applications to only use 2.3"
-	ewarn "as the backwards compatible libraries will be removed in future."
-	ewarn "Do rebuild your applications against the new libraries do:"
-	ewarn "# revdep-rebuild --library liblber.so.2"
-	ewarn "# revdep-rebuild --library libldap.so.2"
-	ewarn "# revdep-rebuild --library libldap_r.so.2"
-	echo
-	ewarn "Note that there are substantial changes to how openldap functions"
-	ewarn "in 2.3, if you are using bdb as a backend. You should issue the"
-	ewarn "following commands in order to get openldap to run:"
-	ewarn "mkdir /etc/openldap"
-	ewarn "slaptest -f /etc/openldap/slapd.conf -F /etc/openldap/slapd.d"
-	ewarn "chown -R ldap:ldap /etc/openldap/slapd.d"
-	ewarn "Make sure that '-F /etc/openldap/slapd.d' is included in the"
-	ewarn "/etc/conf.d/slapd configuration file. While it is possible to"
-	ewarn "skip the slaptest line above, it is inadvisable to do so as by"
-	ewarn "using slaptest you are able to resolve any configuration syntax"
-	ewarn "changes that might be present, however, if you are sure that"
-	ewarn "your syntax will work for 2.3 then you may simply create the"
-	ewarn "directory, set the permissions and ensure that the"
-	ewarn "/etc/conf.d/slapd has the extra information in it and"
-	ewarn "openldap will automatically create the new directory structure"
-	ewarn "and populate it with data."
-	echo
-}
-
-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.3' && [ -n "$datafiles" ]; then
-		eerror "A possible old installation of OpenLDAP was detected"
-		eerror "As major version upgrades to 2.3 from lower versions can corrupt your"
-		eerror "database, 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.2*'"
-		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data.old/"
-		eerror " 6. emerge '>=net-nds/openldap-2.3'"
-		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."
-		die "Warning direct upgrade unsafe!"
-	fi
-	openldap_upgrade_warning
-	if use perl && 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
-
-	# Fixes for 2.3
-	einfo "Applying patches for 2.3"
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# fixes for 2.2
-	einfo "Applying patches for 2.2 compat lib"
-
-	# 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 ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
-
-	# ximian connector 1.4.7 ntlm patch
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT22_S}" epatch ${FILESDIR}/${PN}-2.2.28-r1-configure.in-rpath.patch
-
-	# fixes for 2.1
-	einfo "Applying patches for 2.1 compat lib"
-
-	# 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-db40.patch
-	EPATCH_OPTS="-p1 -d ${COMPAT21_S}" 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 ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
-
-	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
-
-	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
-
-	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
-
-	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p0 -d ${COMPAT21_S}" epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
-
-	export WANT_AUTOMAKE="1.9"
-	export WANT_AUTOCONF="2.5"
-
-	# reconf compat for RPATH solve (bug #105380)
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-
-		# ensure correct SLAPI path by default
-		sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-			${LOCAL_S}/include/ldap_defaults.h
-
-		cd ${LOCAL_S}
-		einfo "Running libtoolize on ${each}"
-		libtoolize --copy --force --automake
-		einfo "Running aclocal on ${each}"
-		aclocal || die "aclocal failed"
-
-		# apply RPATH patch
-		EPATCH_OPTS="-p0 -d ${LOCAL_S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
-
-		einfo "Running autoconf on ${each}"
-		autoconf || die "autoconf failed"
-	done
-}
-
-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
-	# slurpd is deprecated by syncrepl in 2.3
-	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"
-		# repeat? - is there a reason for this?
-		#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 libs
-	for each in ${COMPAT21_P} ${COMPAT22_P}
-	do
-		LOCAL_S=${WORKDIR}/${each}
-		cd ${LOCAL_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 for ${each} failed"
-		make depend || die "make depend on ${each} failed"
-		cd ${LOCAL_S}/libraries/liblber && make liblber.la || die "make for ${each} liblber.la failed"
-		cd ${LOCAL_S}/libraries/libldap && make libldap.la || die "make for ${each}libldap.la failed"
-		cd ${LOCAL_S}/libraries/libldap_r && make libldap_r.la || die "make for ${each} libldap_r.la failed"
-	done
-}
-
-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
-
-	if ! use nocompat; then
-	    dolib.so ${COMPAT21_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
-	    die "failed to install 2.1 liblber"
-	    dolib.so ${COMPAT21_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
-	    die "failed to install 2.1 libldap"
-	    dolib.so ${COMPAT21_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
-	    die "failed to install 2.1 libldap_r"
-
-	    dolib.so ${COMPAT22_S}/libraries/liblber/.libs/liblber-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 liblber"
-	    dosym liblber-2.2.so.7.0.21 /usr/$(get_libdir)/liblber-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap/.libs/libldap-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap"
-	    dosym libldap-2.2.so.7.0.21 /usr/$(get_libdir)/libldap-2.2.so.7
-	    dolib.so ${COMPAT22_S}/libraries/libldap_r/.libs/libldap_r-2.2.so.7.0.21 || \
-	    die "failed to install 2.1 libldap_r"
-	    dosym libldap_r-2.2.so.7.0.21 /usr/$(get_libdir)/libldap_r-2.2.so.7
-	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{,.default}
-	chmod 0640 /etc/openldap/slapd.conf{,.default}
-
-	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
-	ewarn "See Berkeley Database tuning options for OpenLDAP at http://www.openldap.org/faq/data/cache/1072.html"
-
-	einfo "Please note there is an example BDB configuration file in"
-	einfo "/etc/openldap and /var/lib/openldap-data. Review these config"
-	einfo "files for possible performance enhancements."
-	einfo
-	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)"
-}