Fixing gnutls dep #421463

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64

17 files changed, 69 insertions, 61 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index f83d3dbee65e..633dae44c175 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.426 2013/01/14 02:30:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.427 2013/01/14 02:46:20 patrick Exp $
+
+  14 Jan 2013; Patrick Lauer <patrick@gentoo.org> openldap-2.3.43-r1.ebuild,
+  openldap-2.3.43-r2.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild,
+  openldap-2.4.23.ebuild, openldap-2.4.24.ebuild, openldap-2.4.25-r1.ebuild,
+  openldap-2.4.25.ebuild, openldap-2.4.28-r1.ebuild, openldap-2.4.28.ebuild,
+  openldap-2.4.30.ebuild, openldap-2.4.31-r1.ebuild, openldap-2.4.31.ebuild,
+  openldap-2.4.32.ebuild, openldap-2.4.33-r1.ebuild, openldap-2.4.33.ebuild:
+  Fixing gnutls dep #421463
 
 *openldap-2.3.43-r2 (14 Jan 2013)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index b4a1336d045c..a5c92161f3b4 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -37,21 +37,21 @@ DIST openldap-2.4.32.tgz 5450134 SHA256 9ee413c6a816cb41f71826759b78001d04e747ed
 DIST openldap-2.4.33.tgz 5463850 SHA256 81e9eca20f17a69a5d15ebc4c66a323106da4f4f80a32105bc7cdea333aca14c SHA512 382253c0dc1f7937748cb5931d60db90e16dc06201c3e0eebbf0f7fb8b7f1d3634c6036804977e9a5a6e264cc0888abcc66d507310a5c3451d2dc7a758213e84 WHIRLPOOL 4ca58af83c2ec1e2ef9de61963858254b882269a4c97ea1edec31cd6a07f944bec6db79c4ad6997f5c9e8792a6d1dfebd49af9d20ac5538a7f4f92a63c59f518
 DIST rfc2307bis.schema-20100722 9718 SHA256 c61c72e04b45d1e774de1e4084fb2a596210307fc94fe6532b257cdae283b86b SHA512 f71ec7f5ebf826524ef263c2d7e1fc17b7238bd82c3118bfdae2eddbb00e9777ea918c644f0416e818cf60f44807555a0ca48c20cc8738fcbf1675cff7292f17 WHIRLPOOL 77dd13ebbb87f44298cda6f48940662d288a7bf6fbcde3ad88656eee00b470fee11d8ecbd5a6008d3ca3263c48447b30310393881922a258d81722a56e05deb7
 DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bbb2801937fdfd3e5a8cf3517229c38 SHA512 cf313fcbbc79d2d1085f7547ed277f58605d931592d70298204f80f40092bf6450561162178e23add2fa5baf19c0b8fff82f69fbf9c2fde6744e9f29f4dac699 WHIRLPOOL b5dd02f0a5ab183b2f981995d886a6e193ec37c0247195a5eb30bc622aa8762130a053f6cad76923bffd55635e0c4e0904aabf0c1124dc9d69080d33f3f53e1c
-EBUILD openldap-2.3.43-r1.ebuild 18084 SHA256 37c30c55bde2936c78c1243caf64b6dd390703135225db8fc45a3e498e38da70 SHA512 860b2714437d81177694c0fe4e4e737007f7ad7d8479dbab12fcc012fd5c4593bd0c5f0470291fb3a50276560e14fe8d4cac94ec3242767a22923e8b2d70f9e1 WHIRLPOOL db82423f023ed7496c77e8bfa33b9ff6018d96f03f42ad9f4fe1d2b14cde4aa8e55bb7f91a6271d3d22d47aa8ee81b4393637fc63343be7dac882a3e9a726d78
+EBUILD openldap-2.3.43-r1.ebuild 18086 SHA256 045c5a3cbdedfec7720e4d57ddfbd89115c550653b36ae21b0c100e77028d314 SHA512 b702e77af1fa887289bebd48ef8c415968cfe2011800bb179fd02b13aefe4999d145e2997f845dbdd2a727a5f92c5858aa9a8a2cd081aed78337a83b63bdc655 WHIRLPOOL 1a2473b2f0dda3c34ef54c511758b076554e6b490a238bee3dc620d3ead41094efddafbf178e6a35cb8246859b664bdeabfde488ed881d95b8276cb1b754fe38
 EBUILD openldap-2.3.43-r2.ebuild 18085 SHA256 45bf441772b3de71978758a89f76f9e761cf9833c493f0a7796db97c2ce8512b SHA512 08a1d036ec2ac156eccdc5d32d8377fb031287466dfbc550c8f4cb6648ceafebfd48faa9b7f3a4a9572b46fb2aa92c3bc45d46b066a48195034aba59bc0dc606 WHIRLPOOL dd78b872f3bb7064943ee04d3115453e0af4da916a7f08da4e3a90912a89e5af000208fa6c4e5e34e8b595b553c285fa0f25f0e3a9b84f2ca1228d983a3c0e3a
-EBUILD openldap-2.4.19-r1.ebuild 19730 SHA256 4e358e5b094537aaa633b9d9470b5045a5bd000c61b2ee4356fb4cc750d0a581 SHA512 8117fb7ab2e4401b8f418cd448ec33d6dc0ef1e3e5aaf1c9c3fb42ef3a3cb99a020ad037e4524b4c0a47a51cbaf7fa96fc789d3b25facf2b0cbbac81ef73b63d WHIRLPOOL 3d6a15c9d00f75f067c4c8cf25b7664f37f2f446f94d76bc808835910221a869baafcad6781c68f63ba713d2a1e3e7efe1d401094a6589dfd32ca0f7479199e6
-EBUILD openldap-2.4.21.ebuild 20065 SHA256 3fc415bf0949dc46a7cbeaa6d847e1735b1868574cfef6a5cb4cd7ca079b4014 SHA512 54c0d111e4de7f79c789fdea7587eef4d0c55d7b09d51379e438f85f0c7c1665a5caa0294e3cd9ecdac19f6348d42f450325a34ad0da53553ab960451b0959e3 WHIRLPOOL 24a9a32875a4d627dc1032526dbc2451fcad6158331eb2431e05ee802966f3b94890610f8f29a903e236904de4b42ee0e33442ac1c23e1627c04cdaeb53c564d
-EBUILD openldap-2.4.23.ebuild 20055 SHA256 93343e668f213c833d09e51c567384cdedf6119387cd3e38dd9fe9989e30f823 SHA512 259efec792ae32994cb6a8aa42ce9b2f6cf2ae1982c73b3080630a96ece803856e9924d2d8ac073f8ff4e082f730affdb8ebe8d1ae82fe0655dc0bd50749b7b5 WHIRLPOOL 753b36331ca1aa702f54a6430cefc23fff906d604a3fd5b98ff65f4cc9d247484e69767b893fc54ff9ac125071950e174ee196eac8a610c19f893ac53bca78e3
-EBUILD openldap-2.4.24.ebuild 20055 SHA256 dae051f9106d6167a1de0aa99c13d65b5ab390cc24a9aaa72188ed6d810d00c4 SHA512 526676574143334afe747991ae5825446b9a9399f6571da87c428cf312a4fc7141cad85b27434f04be03080964ea3c367f427c7105ff75580dd29f4af67ffaeb WHIRLPOOL 5d0c5d815d8fad655ee6c751d55f2b1ab5ad3e15305ec8923d7988d748464b94321ae51a20e8f9f3d35cf557ed6cf513dc617957dff0bd15a56b4ac198b4f770
-EBUILD openldap-2.4.25-r1.ebuild 20760 SHA256 fd853f3f5513fb65e05aee6222fc7c14947577a4937b8099c6e2341c6216e562 SHA512 4e195967697ad14625c4f873484c7d37735126a954a46dfc429438c79a3aba848376a71b114b2311f26e15f00a23b456b5110720e4218ea3afdaae4bb2a26433 WHIRLPOOL a1f1f47621a500ea2333d2a235938662c57528c62dd2c04c515bf958d1709a93c9b0598ed8ce8f4308b7c4b8a289b1b3a11799726e0899c61e3d0c33712eb4e0
-EBUILD openldap-2.4.25.ebuild 20065 SHA256 6455f4c344181670db2a3f7d3d2b50730f464e2d6e7a7e2f45a5cb492b98ba6e SHA512 17bed0b4ae8b295ecb4a04f932f18a71f10adb3fbcfcaf8635711219afbcbe2441f24d1144f0163306da2054c3b682e0abb19a95a7bcb8f0ef0a02e5d288e0c7 WHIRLPOOL 9e2fd06542e9559a765e42a9402b98ec4f91a8f00c3eb3065995d70255e4ee493ae61ce7b3d2b4eb6411412bebc6d5eed50f88d96c74ba5941669eb29700c9fd
-EBUILD openldap-2.4.28-r1.ebuild 21959 SHA256 ab73dd89914c9ab2d74bcc487594757e53f73b16a672cb8ccfe33b496eec5ee0 SHA512 7e8aa14d65cbb7cf0e2c7099bd6c3926d3b6377d4f34dc29af08c7689134ae1dfc636ecdd9e273a0c7fb9006ba0c4c1b150f4bf85eb353065b3b76ce58461ecc WHIRLPOOL dd2b01a0758a3dbc14832afff642adf8d128a2d9bd9c6e7d634d79b6475f5e5869b24935c9377e56d27875f6ae36ff73e1fc482e0a3256018c5a94ba0fb4ae0a
-EBUILD openldap-2.4.28.ebuild 20757 SHA256 b411acac1feadc03e7e452b9313e470270725521f9de65014183929ef282de53 SHA512 25909babcef801fd6e4eb1eb4ef7f25e1dd883d25811a101d091ed6f4b476c1c4dce73b96bd5cacad1ed601fd35ebe81a6d47cf34bb9844a966c9ad812985db5 WHIRLPOOL 29d61be8dfa3b38301868da94e69d3ec119d4617c1f400487ac055ba1fa5b5555255b5144807b52f26f9e629b3d1c645fd08f9d195aa352001481f0a23c93a37
-EBUILD openldap-2.4.30.ebuild 21976 SHA256 b9f28b5be3c4cdb1033e947371bfb2744c171d52a75f34cc35ba7d9e22b32ce1 SHA512 5b04b0dcc677c4f3f2da98770527c278963411c819bbc91ebc4b97b0fdab9b64118790f5c0081abe97a7460373e226de4c0e29bf08076330d6a286c2d2c20de6 WHIRLPOOL cf07f2a4d2f4937262a17b1f4fd91ba4fbe169acb10cbae3da7193e1aff55e2ded0208be7f90f5c142ae4f25f7e88a2cea33c2eddf28cb557c195b7a1b23408d
-EBUILD openldap-2.4.31-r1.ebuild 22308 SHA256 e2119da778f268dea2b6e7d43d4e4ab410cc9435c7cb1ddf757b7ff50ebca5a4 SHA512 5a2cc1acb641a78df46f6d5625088564f99534fbd285ce5de309ce88949cce84b363623e0ae6ef16f55117a2b06d9e9208b369b346f017071c302d3c95d663a8 WHIRLPOOL b5ac2e045e17fa2f245a9bb54bafca1b8af24125286b1f577d95cb2711625488b84dea36c4c446d42105570cf57ba0f5cac39e13133b806afb3ff97b66b5198c
-EBUILD openldap-2.4.31.ebuild 22248 SHA256 8f76f5f12a09c6031241049f882642d4b31ff21ae5fa326476390f02b48defeb SHA512 92c78c6c1fdee0081a8f629ee74cc692cc89155d0e3345fd852ae8379eacd1c152e7e56b3a1c99d4dd6d6b6e4b3754b4a8b5a3abfdac4f68cf3c04a64d973fec WHIRLPOOL 017d34dc768c392e6537351acc02e8a2172e46138ebed674bdbedd00a89a6b020436657a47dfc330badc9d13c5f0c9ed5ce519ffeb060fafc2362251ba74d242
-EBUILD openldap-2.4.32.ebuild 22310 SHA256 cd4bf618094f84cffc878dce3c3a9fcd8c3c94a9713f5016cc689c795ca04d57 SHA512 453fa140f41a840e3bfcd8b2ac4725749c693d32e62a785c3e160717eaf19d974cbc76205ed748def9d517e2e81329b15f4a88493e0e8a400d7f2ef806b4861a WHIRLPOOL cad6b0437c6abef6fecff2d14223da8e78744b7775ba4b18fdbd690cf937614bb72fec5b887fbb79032e4fd4dddb1df265ca78f12b2204170062fe0d117cbf2b
-EBUILD openldap-2.4.33-r1.ebuild 22123 SHA256 996e857f18cf65acba22b4d059e23e6df18f248fb355f21853d1cf839f672536 SHA512 37c169ebb161d945290e34d1c17add620b14e342a3b2679d6bb0e8d29151f7d3256b487f85af651e0be3d1025d70f42b346bd158e3b1ff95fc32293fac37aa62 WHIRLPOOL 2389dff4b6f10d86810b76a146039bbdf0a64eaf3cccbadf37c6cb9af52549127a1f4dd8bf4a2a98ffeedcba0183b91f9c65d21fd41300ace6b39c033edf5678
-EBUILD openldap-2.4.33.ebuild 22310 SHA256 393a83a8f143de61221387aa25052581e3b7eee02e35be58abef610c3d8d9f6e SHA512 adbc96c8e3c441f22fe4feefe494a4a9c520e8eae23308b28ec5c111be5d25d991ca26c14e84b37d8079761814c161b30982444181abf290d1278e61ee8a8376 WHIRLPOOL d468542433b1d88b05517c5ef9cec3810f99039e2c99a4758fdafd97de3a0c75ba3fd10b65059810429c1b6f546f18bb1f00c5ce1e725f7f80f4aff1d7c97f1c
-MISC ChangeLog 74671 SHA256 b1686cc7c75a01aa4a319f94b0af03743a5d691d2872de884ff6c7af15525f16 SHA512 475b21a77551b166b1e8290b3cd3671435b84e38b72192230e5d837a80fb64967e4bbffbec52ab838a53de23cf737d71225ae62f329cc3d2043d143051f4dad9 WHIRLPOOL 45202cb22077885c7e752ae64daa4a085209828d751ff20acbf310bfe18323e3ec2730db356dfebc24e5231c6ec712751843eb735d92c64d2346f6f7054a6ab5
+EBUILD openldap-2.4.19-r1.ebuild 19735 SHA256 0c6a8c2bc641c8e761faa03df184d9d9cac49a28d2ecc2d605113a13868ccce8 SHA512 cb1a5af94c1660a273e36f583b63a3aeeba6ac6e69f7ec2bf46f100fec88f969ea20470a8df1212b15f83b77ca509def2dce6a2ce9f941d076725a7e492e7cef WHIRLPOOL 62f16614024e5b85ff23824021127fc85c759cd68d1f55c9336d0732d3429a2b950187f358c30db1316624ea307a7f42ff8cf21828cf99482ee047cac61e750d
+EBUILD openldap-2.4.21.ebuild 20071 SHA256 7d59fb82c30ce3264f036bd18368948c846d2203819672b0b595ab6f127f030f SHA512 00872eb6b4bf45d5c275b33469a2481c73fcd6982b52084df287bd7d5d51ee2c81999c6129df85c3efe9cd9f9dab8fc057c1cdd73d69f56674ca667a9e3becd5 WHIRLPOOL 5c3cf9127a57da9a420760f2d5b02b804b919d65ab32c08b7efc1bcf5726b7a66bacd9fd2c4c8702c8ebafb1a68c0957daa5e41a411b7c19c9047c98cc090aa6
+EBUILD openldap-2.4.23.ebuild 20060 SHA256 fc323b39b8a97a6101cf6abae2d1a1899c407b7b8766fbd0aa538f37f3d2c26d SHA512 8bb6b192dadc62e73eb7ce77ca7635b3d94c66e31c986507e75ee3b9d7353d7f81c0c12d45a57cbd3fc01e2dc4e01eef8560be8613233e5ac7b22184dd3e67ca WHIRLPOOL 3419ad74f0b45e3f7fce4898d6e215c3d4745b54bf4658e70f6ea128e91373a1bfa4061c8444b1ec517b9973f249342200272e8d5a8a3144c88d4ed5f2782827
+EBUILD openldap-2.4.24.ebuild 20060 SHA256 e8b4030d0a03a21a42f69c2467acf80d8902dc58f7d888e541a9bb515aa5b0c4 SHA512 42390266928a7350c849d1d8f1068dd98a85221d1990e7f7105df33c10498a47d5165a527cd2185dd62b82d4f7af932f07b660b3d07c887bc188736dcab1881a WHIRLPOOL fe4440c1fcf5c740d005d0880b62984f10ca7e23d7fb2077696518f4f98f0af99c1051223a66cffebb9d316c3975e4e0c9c9c3ab1544b0dcf3a3c63a04e625db
+EBUILD openldap-2.4.25-r1.ebuild 20766 SHA256 b5a590a0735703bb2c7b61c8db92fda740d16a1ed9bc54873e2d823b23700883 SHA512 fb3c2777031abed3044312c81e653beed21ac2eada9a4271a2427ffc951bf65dce85581cb2352c0010e7a16f0747673da380286efec51f3cb061c8e59d5bce27 WHIRLPOOL 5188d28af912ae04c578152ac62f9bee6198f5285604e8b0518eabc0976efea1a956c3451a5c93bef3c20b330759b62d1a260b282506471379d8411c08eb527c
+EBUILD openldap-2.4.25.ebuild 20071 SHA256 b0ff5a62de338df244b698078b639f4bc4d38364d7bfa521fa469e031722927a SHA512 15252f0b5e14b738d39ff0d6e37316e99b8c299f2f1d0963d6550c325474bb5fb4d7ea24aa17b6f124605220f7c4f000a11b9e537d9ba0ff6e66e89fcf518527 WHIRLPOOL 8d8195d3a1fa513eedaf05f123c1b07cbd7599282ecf912ebfb991f5a78e4213fa7f5d5d0a39af4c15b6ab59935ca822faf48169b5a73da551b14bb2a084b662
+EBUILD openldap-2.4.28-r1.ebuild 21964 SHA256 a29f6cffc6f48ab8bfb5617a132b18b2fdada8f8a8100ef004d091995a609375 SHA512 eff9f5d47331fb5e2df2607ce16bf6367d4cb3bf63c6cba87dc7f25b8b9ab2708d8ea9829ae25463b6bfddfee98679975370dc9af90501b4ca7a165c4c61885f WHIRLPOOL 5f65060fe101833967a054737b21591b0ff39ff52fbfff8553e0edfc0ba03a4979323d56e431798f8ba16825c7d14db1d8463d9d1d4d1c169e9544a9474a9a3e
+EBUILD openldap-2.4.28.ebuild 20762 SHA256 fe6cc77bbfd2feb1f5d7a251193f703da7f225483bd8f4c2c70b126efb7b915f SHA512 c5329d33d30bd454fc831d71f5a0e7ad864a3f3ac5b7eb3ed71d546c689feba7789009c8e96a32b2fe80bffc3fd1c6b2781051315d0220e10215446661a688be WHIRLPOOL e93d38fbf9f97e799763d43fc80962e1b669cbfd38c29d9b42a0c99f76139b285323f00e0c191ad6a37af7cc39d9b8aebe0d327fe8f3cca384f5a6999e73a563
+EBUILD openldap-2.4.30.ebuild 21980 SHA256 4335713a98af08ad51579f4dcaf881114f41ed02f79ec85078b4d0f040d5706a SHA512 48a7f67c3db4a43a821b3732a2ff9cecabb29b1ab83dc24d9b6bf04a63a7da3210c024305edfa8ea33f2f78f1565bd2f237d1c9c705a18655447447434e6b62c WHIRLPOOL 2121122411e2bf04c1d69a1dd15ebe7b7d463c298575fdfcc5c6372fbf3fee31a9ae8073f510d7c364b8460898d1a2f9d211cf86d5b498be79805ca08a508085
+EBUILD openldap-2.4.31-r1.ebuild 22308 SHA256 38eafea1150673d45fe5618d92c133dd8580bbcbe4dd3e27dafacb65114aaf9a SHA512 952fef84039a4b703c7b4be2021f73f14b5f6d904a8594e1df6174e049be47d5192233c264e0da8ba61f1ec827f94522e26704ae753c5aaddf20c59f83c779c7 WHIRLPOOL a49c47985bfbe98c5257fb135027aca989bf8570c9a5c2cd2b2d4cf5cbe20d595c20a24193bd08577e6e324764666c5318f105c0486cb0b4f5e4f3f1082ef448
+EBUILD openldap-2.4.31.ebuild 22250 SHA256 bda244f8d80ab1088d95d71340268e3a74d807fae8ebf0f636befa5a337ec75a SHA512 c4a200d580e0e714cea6e3c6d449faf1d86840fb56ca49df5ba05acf720c46bf35ded88fb36b849dff7f09431c65a9fb78ed85741833239ea9bb23dec984eabb WHIRLPOOL 5b90c65fa5730efa957060ff1ca53244f4774ce845b67db76dab66f05d2a06a947a6c3c8cf40a39ee23ae7df55814e6408a0ee6f24942a9f67e09778cf35ef27
+EBUILD openldap-2.4.32.ebuild 22313 SHA256 9340c09949f1a3ebf55fdad245842f0545d0dce6b083a467b01cb3983e12bb8f SHA512 98b47b576f67baa122da7cd433fe0e79118855ac05978b8d454c8a6ab7790e41c045fab679829ddd12596c337122b88cb4d3f10fe87f7ededaab41d07f0bd597 WHIRLPOOL 18ce448d4cd2e44760e22663e75894859bba7b5c80217a81f87a150327024b41944d5c62358a844ef7efdc568983ad43b00983fbc714152548ddbefc45474487
+EBUILD openldap-2.4.33-r1.ebuild 22124 SHA256 27387cca9a09708da63ec122a4d0f29ac6acdf26381d6d04aad8b318177f0773 SHA512 5102f1238092df0e46fd1e31350774ff664e25bddd9620c1bd6cf3bfdb9f329c48b985d2b6b73eeffd3ffa14458720d5023a940a27466c00657afc7e5fc44eba WHIRLPOOL aa4ca5e60b90036f1322a59b6743d980a3de55fddf76fe5e8c394d591dcb8d70b2d4b5632a65459b6059cf4e4402149c3a9509aa06fae716e91fcbd9b851b643
+EBUILD openldap-2.4.33.ebuild 22313 SHA256 a5f575ea4aa5dae4920c949a4b10075fc19b49c5c853179aed2a630a3e1d139d SHA512 adad4157db1c4635ba83044d2ec7cc40a1a23c5e4f488afde5037877f149ddc03b16f547abd98989292efcb29160b61b40e5557f165227c7baefcb8482d4539c WHIRLPOOL 8835bf8ee092cd1653b1457952f11040788a2939243897539685b6001da97b09c1de987dd00f8084cab337f53557d4af43a30c92ec75337b4536d7964a49f500
+MISC ChangeLog 75165 SHA256 30ecc50dee5ee2fb1038788a139e896548365e59d8075a394078449e29a09b71 SHA512 c6d3c6afcc3acd1ad23a205d1625b49cbe35bea75875112bfcf0bb0901eeec9b7d333e565e9b1b2fcc856805d6bea1084f157310ed3b0170f03e6026a6c2806a WHIRLPOOL e953d752283dc9f12d2e12ca77db99d3e813d4f2dbbfc45d84b54028d795a1e067053ce5dc902df66310689c7de49dcca3622c124d3e151d71f19bcca849047d
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index 36f4a82e5b0f..b539f0f78a1f 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.11 2012/05/13 11:38:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.12 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index cb907980a9ee..2926f6598a56 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.15 2012/05/13 11:38:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.16 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index 1ab77c019326..edd21ae525ca 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index 3a064f30c59a..14ab74ceea8f 100644
--- a/net-nds/openldap/openldap-2.4.23.ebuild
+++ b/net-nds/openldap/openldap-2.4.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.15 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.16 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index eb7ea00f91e2..67a24beee04b 100644
--- a/net-nds/openldap/openldap-2.4.24.ebuild
+++ b/net-nds/openldap/openldap-2.4.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.14 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.15 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.25-r1.ebuild b/net-nds/openldap/openldap-2.4.25-r1.ebuild
index da6c7ad99cc7..b20bf265a253 100644
--- a/net-nds/openldap/openldap-2.4.25-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.25-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild
index 9414fada16b8..7c5f0476bd6e 100644
--- a/net-nds/openldap/openldap-2.4.25.ebuild
+++ b/net-nds/openldap/openldap-2.4.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
index 1d193f912659..191e1b74cb1d 100644
--- a/net-nds/openldap/openldap-2.4.28-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.14 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.15 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.28.ebuild b/net-nds/openldap/openldap-2.4.28.ebuild
index d07168cc3359..eb6ed695a01d 100644
--- a/net-nds/openldap/openldap-2.4.28.ebuild
+++ b/net-nds/openldap/openldap-2.4.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.7 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.8 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.30.ebuild b/net-nds/openldap/openldap-2.4.30.ebuild
index 27aba2d85024..5db18a16514a 100644
--- a/net-nds/openldap/openldap-2.4.30.ebuild
+++ b/net-nds/openldap/openldap-2.4.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.9 2012/10/22 08:25:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.31-r1.ebuild b/net-nds/openldap/openldap-2.4.31-r1.ebuild
index 4e587b300d9e..194e55a478d5 100644
--- a/net-nds/openldap/openldap-2.4.31-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.2 2012/06/13 11:06:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.3 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.31.ebuild b/net-nds/openldap/openldap-2.4.31.ebuild
index 7e3bcff9fecf..3fdca0d92eef 100644
--- a/net-nds/openldap/openldap-2.4.31.ebuild
+++ b/net-nds/openldap/openldap-2.4.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31.ebuild,v 1.2 2012/05/26 00:34:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31.ebuild,v 1.3 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.32.ebuild b/net-nds/openldap/openldap-2.4.32.ebuild
index 5f68756743c4..4f09e4a1c0c6 100644
--- a/net-nds/openldap/openldap-2.4.32.ebuild
+++ b/net-nds/openldap/openldap-2.4.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.32.ebuild,v 1.1 2012/10/08 20:11:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.32.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.33-r1.ebuild b/net-nds/openldap/openldap-2.4.33-r1.ebuild
index 1b789dc16d86..8dd1c1a4c2c2 100644
--- a/net-nds/openldap/openldap-2.4.33-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.33-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33-r1.ebuild,v 1.1 2012/12/01 23:04:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33-r1.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ REQUIRED_USE="cxx? ( sasl )"
 # openssl is needed to generate lanman-passwords required by samba
 RDEPEND="icu? ( dev-libs/icu )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		sys-devel/libtool
diff --git a/net-nds/openldap/openldap-2.4.33.ebuild b/net-nds/openldap/openldap-2.4.33.ebuild
index 63b81a24dacf..c8d8067d7b79 100644
--- a/net-nds/openldap/openldap-2.4.33.ebuild
+++ b/net-nds/openldap/openldap-2.4.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33.ebuild,v 1.1 2012/10/16 19:56:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )