Bug #485166: borrow the dev-lang/perl[-build] workaround from the eclass, thanks to dilfridge.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

9 files changed, 30 insertions, 43 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 36074619bc79..5edccc298659 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.486 2014/11/02 09:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.487 2014/11/08 05:09:25 robbat2 Exp $
+
+  08 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r3.ebuild,
+  openldap-2.3.43-r4.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.23.ebuild,
+  openldap-2.4.24.ebuild, openldap-2.4.28-r1.ebuild, openldap-2.4.30.ebuild,
+  openldap-2.4.35-r1.ebuild, openldap-2.4.35.ebuild, openldap-2.4.38-r1.ebuild:
+  Bug #485166: borrow the dev-lang/perl[-build] workaround from the eclass,
+  thanks to dilfridge.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> openldap-2.4.38-r2.ebuild,
   openldap-2.4.39.ebuild, openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fcc6253d9047..92f8ddcc725b 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX DB_CONFIG.fast.example 746 SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b SHA512 07199416b7c91864a1dd5ad45642367c4f79ee8b694214305289c47afb5b53420f0fb81cf7c8b117400c903535e88a2dd47bda28d57e969aeeec669debf6dc9e WHIRLPOOL 1d6a2adcdbbac2698d8d5ab1867ecfafee23c8561c34addaea30f59bde8b4bfad88c576ffd7df102aa428c2588ed3b9376de49606eb6608c8e873f8119326c5a
 AUX openldap-2.2.14-perlthreadsfix.patch 614 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 SHA512 e2579de72194c63e445108a39a85635622c1a629cec9d276df84ce9d770dbe7e2df2057663bac192558af3dee60fa2f0ae92f4cc34145c300fe141ae7f3f13b3 WHIRLPOOL 24cab36ff0368f81f555ba0fa0ea0f78d245d1863bf4c6c6d291536b16bdbe628a9a204ffccce12a6014b71717f3dd722c9f95061c1a519e273c0535316ad97d
 AUX openldap-2.2.6-ntlm.patch 5011 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243 SHA512 8140dba85c56f269c953b0b23b2ca7eecb42f8e5167f4d0f08511dc8c06c30bcb42c3e38ed3b77d5622780a94c0aa9eb65bb8e45af50075acab97e7f466a1a9d WHIRLPOOL 75c2394c46242f738b5ee0db8473b05b5e7e75821e89dcea3ca7a139e34cc61f5848d0601dc66499dad35beefdd02aed5486ed138cfd8e216041aa5ceb85c920
@@ -51,13 +48,13 @@ DIST openldap-2.4.40.tgz 5641865 SHA256 d12611a5c25b6499293c2bb7b435dc2b174db73e
 DIST rfc2307bis.schema-20100722 9718 SHA256 c61c72e04b45d1e774de1e4084fb2a596210307fc94fe6532b257cdae283b86b SHA512 f71ec7f5ebf826524ef263c2d7e1fc17b7238bd82c3118bfdae2eddbb00e9777ea918c644f0416e818cf60f44807555a0ca48c20cc8738fcbf1675cff7292f17 WHIRLPOOL 77dd13ebbb87f44298cda6f48940662d288a7bf6fbcde3ad88656eee00b470fee11d8ecbd5a6008d3ca3263c48447b30310393881922a258d81722a56e05deb7
 DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bbb2801937fdfd3e5a8cf3517229c38 SHA512 cf313fcbbc79d2d1085f7547ed277f58605d931592d70298204f80f40092bf6450561162178e23add2fa5baf19c0b8fff82f69fbf9c2fde6744e9f29f4dac699 WHIRLPOOL b5dd02f0a5ab183b2f981995d886a6e193ec37c0247195a5eb30bc622aa8762130a053f6cad76923bffd55635e0c4e0904aabf0c1124dc9d69080d33f3f53e1c
 DIST rfc2307bis.schema-20140524 12262 SHA256 6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e WHIRLPOOL 40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de
-EBUILD openldap-2.3.43-r3.ebuild 18096 SHA256 fac101a52ae9211b102df015bbf41dc5d3f1cfc4221e03dbfe7fa0367da99fd0 SHA512 c895e79c2d08c1b7682b491ac2386e9277b8bb70181a835458c2f6782422596b579d42290b2440db7c4201770769e3e0f08905b30b9dd9f6f85f5e5d5c493c5c WHIRLPOOL 825bc8f7de3d5209c601ad422416922ef4f24d5c94075aef63a93b621a65d46181e0b00dcff51ac78cff2617ec3bbf53e9b145d405c2b05b7c4665acb5c0f6bb
-EBUILD openldap-2.3.43-r4.ebuild 18288 SHA256 322691b18841d24e193dd330db8aab32ff8a9162bb3d3c20d651c22bc65ef374 SHA512 d60136ef3c68b517174fd868875faaec699c86d8d757ecd4228e8161cc01f551c7a56c991071064d8b5b3ae8ceaed1bf8db136c25e8599654abcb4bbfd24debd WHIRLPOOL 19267b8f1adcfbc319613fdc4316b56e5014ac4f85ce36f9e8ad5e2e9ab498a7099183c7a72dc4e9fce1c37f64acd2c986540fb29140bf6317e8ecadcbd757e0
-EBUILD openldap-2.4.19-r1.ebuild 19739 SHA256 a6370d86b51a000688013da12e438bd287fdbda925c4a84c7bcf13d276c47c67 SHA512 27790e7897d8f7163b5c8dc03c561391b59772fcd2d4e851f19f52795a22fb3889931fd66c78e3acf40b007b1ee0640ed5ebd0165d3a4e32c64bfdc2c52229fc WHIRLPOOL d3fb2d7b43bee5b73edfbde64ccfdc87705803482a23c12c130a3a82446a333989812f51259b57864a882e09217b40694299e0984467dcc0496d7e8525d50fea
-EBUILD openldap-2.4.23.ebuild 20064 SHA256 068edc6e933baff1d89bd649330ae3c2b6225d029625096c77c73adba1f27419 SHA512 6c2d0762821940af7db0fe757f505c956f5d07d1724b38f9d608ffc6aa151ecf59ef9d1f467e4e8bf7b391dfea6dcb3b5cecbbeb9d918aaeba6ff2d710a2a931 WHIRLPOOL a27109569b30406d81f8405921c655c6c9e629d28bb9c4e748ff99ccd868565f42e35289c5ae1b25bbac45ef4913392fa011e69ab0ec0a1b862390c8c63765a7
-EBUILD openldap-2.4.24.ebuild 20064 SHA256 795d9c0ff98ebeb9063bbc402587855a9a160e0b94e9a040463faa68a64cc294 SHA512 eaeed605689c1716620d48b476b2f65e5b8546f2f3f12c75a4bd75f8c61feab5286aedfac881a0d404dd9e9eb2ce5de18312a5cf258befd655b23d4a924e8c11 WHIRLPOOL 31eb3838180f231291afd7eae51fa68da11b6bc456ef13901cc182ad5bab3e17a4f5dcd336757577a5469b077dbfe3e77bd2cabf629101ab966938e0d8e28cf2
-EBUILD openldap-2.4.28-r1.ebuild 21968 SHA256 0d410c56098941c93f2d4b630f8dd72eb89f9be152cfc71ce6433dcab15b5b41 SHA512 a188f9308001b4443ccc96321c57fc7831f66eac6a8a614eefddb088b0e1ea0af58f30274a5a748228cfc8d2ada21bfa3215177eb5bfa6f352d048c96bb81a29 WHIRLPOOL 2b3e32e5e848f30aa4f7296166a9ee273d42569fc6a9d8a00220d1be1d1193e3d6862d21350d505e206af9d8ada6a35d958773d12a539a9d6b9059ffa83fadef
-EBUILD openldap-2.4.30.ebuild 21986 SHA256 738e7cbc3610905c10cd0d897c6e41ec44cb7a129df6d8aac7f87b6207c715e3 SHA512 ce9f0440dc3aa1b8ac34c0f466848806ebfac9fa78a551d9cbff1d85880f047b704d5f13d88023b8694e2b6c07803176c9f92a993952eff0d7c5532677117d27 WHIRLPOOL f47a431f7c38d182330025fa59ffa002c9bd8f156463f7954524c7f3379e4d83a0a3f1083dfc8e2a31a578bc09500b9a6c30c88ca73a04df0b6b96becf941bb0
+EBUILD openldap-2.3.43-r3.ebuild 18130 SHA256 6b80a022b58cddd5234af88b26704ae8673a087eeaf33780e77aefe9764ab9e4 SHA512 02539369713bebb149d1fb7327ac2ac0f7df3211320755bce17e46297941c8ac0015d89e6836f7896fe4c2807c1a705f079eaab0f1c22d27c740e423560029f3 WHIRLPOOL 20784ec12fd826a07a1f26154b3c26b2b82df2f8c70a75a1346b7e48cdc9655da1009e2d1760a010392def997f10f9f5b39ab860fe9562b3377251e25c71a7f0
+EBUILD openldap-2.3.43-r4.ebuild 18322 SHA256 32459f254d843acdff9a25fc0892b8fbaf810f9f8959bd4f67fe69794a4de1b0 SHA512 62c104c1d7db911524a79bc557bca1fa561e771c097397369244944bdbfb05bf0d6b7edd4ca866d33121dd52001d786b0328dd2fb9b217df8a8941378dec7641 WHIRLPOOL 0dd83b2806534ddd830b013059ce3e5edb4b2f05c3ac679d433c01f1dedb479246f5703ca61a6f3f42c3e2e4c03ec65a994fffbdd784375af804eba9bfc7e0b5
+EBUILD openldap-2.4.19-r1.ebuild 19773 SHA256 f32a25aa7bc9ea0b0c2a10840fae952cabdcbc71e470fc89a5b5aed5fc622635 SHA512 a38cf2ca30a5df57a6ed658214bd060cd04dd0f38fd8d55d59c92a3a6da089cb6f764f30ae7566280c0c248b228577e1ee94d6e09a513ff4811049ac4482f907 WHIRLPOOL 54561fc97957b364411203ea0dcf96861d88a7436d4ba0b8573c37dfa58ad7fcce9236f8cbe53b9a9d0f672e70c5d5ed23cf7125082e45e0113897a47036b321
+EBUILD openldap-2.4.23.ebuild 20098 SHA256 0093d4162cf7d890283e1fef0e80f78a901a884bdc0499190453df3930b77954 SHA512 28ca8f2403c8cfd27697df7131a29d791ce4ef154845a63eef2e4dd5f35e66c86a9c82fbf95bc9fddc31001830b4a4c7a52ec19edc1305571d620a2ea0afaf94 WHIRLPOOL 74a386f4121a5011281f41a7999cbbc205df02a0a83fadb2802a32c5bcb55443f87ca35c4771cea897ab34fb70b1b466d55a9240d7bf3e2825f7891118c46a81
+EBUILD openldap-2.4.24.ebuild 20098 SHA256 f1e162f3eff91c8e5fa4ddf0e755c2a48924cf41405984706a7a0c4cbf22cba8 SHA512 11b23821724e291a32d91422eaf760a4e2dff18363a371ea4ad673c023b95ea10e2e729c6fa0a5e5e336aa64f11b40358292232d0f88ea15aea89b587bbcda32 WHIRLPOOL 1ceba1817ccffe002cb2d96786264ed28d021127b34473e17e4d6a0e214ba6dcaa219db5ff1c5ff88080ba9eca65398a82148643caf1a90adc8982b052f86800
+EBUILD openldap-2.4.28-r1.ebuild 22002 SHA256 9980b9e7df99c662074dbc0aaaa4ab4daab6e0de7bec1492529526a39bdcc013 SHA512 0e6cf1678c90fdc3ece660af52228fefb03534978682ddef9304400863f815489799f0e9253f0a2788c4da9dd5c9e635fcf2d120d788488acdc6f34e74121bdb WHIRLPOOL dbb0087d8fd713c27314ecdb8a8a0584f8bba73c93cf9e98b42a8a2c66341228c55c4694997123abb9244664ba6c9763caff8a169730874c08b5c7cb23037a7d
+EBUILD openldap-2.4.30.ebuild 22020 SHA256 5742f38c245d0185c7feec8fd47ddbc40dfbe7ee88c36d16bd8984355c92e038 SHA512 52ec9c2a1fce93589314456de2c55bdab098d3327014d85cca55e83f86c59a183fd854493c4306d5ea32d7de9c2b78dac15ab44b3ce60eb193a99ae2961a29d2 WHIRLPOOL 8be58832c9c0c78381e168fee2fa67bedbdbf990c142c5784ce2adc02a864c1c4020a93d072bd2ab98b56f2782c5741f79a69543fe4cce18a2323fd9d9d7d476
 EBUILD openldap-2.4.35-r1.ebuild 22450 SHA256 6987728b036ceef21a0e0a1cb989bdb16649c74d4b4484b605282b8760aa4024 SHA512 c96e2dc7a71166b6c831e99139546dd9dee2e75c2a4a5a932a99d0db4fe407c155ce0b97b5793297995932fbce64210fd76a78e5190db9055866868b926b0cd7 WHIRLPOOL 208f161090d1cff405fa58842b9818a67f44afa6c41f5a4197eb113bf4e63ccc21d726af7c7ea1b4844702ecd6c68e9da2833b3a37bcba4d0bd38be958204853
 EBUILD openldap-2.4.35.ebuild 22183 SHA256 c85606e0e461306d3da36f2ebacffea27edfd6152d428325480e4e6146fd1bfb SHA512 7f1eb861be44a5094bd1a1f4530ca382033ea76903e694665889ff3d9475dba856de08d583f5388375bd962f45288471c034c1f3f9a3fc0685a740665ce7ce80 WHIRLPOOL 4d9298bbe5c4db6b17f1fa366c1922383400a25db44241dc8ff6cde17f4cb2e55ee881e6f72533a1e541af51a66df34a103358bd4a8b5d03848ffb95d6827f19
 EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db5ffcd514628adaa106b11a801aa174 SHA512 0847b7fd3d9c473501e08fe3af0562476eb2325c4749c2f7f7ae63f55d0c8aa940d2ca1e3667ff45bafcabe32a23175bf9e99a37b5fad1f2c612c42e20d54b1d WHIRLPOOL 735b128508f135849fea5c9c4310c2faed5e612b8b662f3f44ff89d05d87edf68a86d4c00c22470e6d634876b910e629b741ee9c8d8f3607bc77a565f7f77deb
@@ -65,22 +62,5 @@ EBUILD openldap-2.4.38-r2.ebuild 24008 SHA256 69069ef4ec0cc311c3513b1487daa53dee
 EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702a2fb8a4178c41cf2664766cb7c9 SHA512 cf0d1fa9ec9bcd17891b657c81a79d116c2d05a1a6681771e70ee1242dfbb078a52ea65d2797b9460d28e1e9e381d9f7e6555bffbb05f10ac7e0110bb9e9bb31 WHIRLPOOL e935d519625bb5aaf73b6cfdbb88814680a01100e6ad850f2a01af6e79e0bdfc02e6fe4ce125e897eeabb2760042d36b250cecdbf0f11abe563b4ae61bb57fd4
 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e
 EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232
-MISC ChangeLog 85623 SHA256 588f73143271f1513b17be7b77bfc55aebd12f205319c5f4d19c2e08ca52c2ad SHA512 568e51880d60fb6deedb01df40b7f010536a47a4ff144ecbc1df81030e2fc62e085f801cb8cf0e2151ea4e017aae11138242e95abe2057aae59352628a621076 WHIRLPOOL 1a7a5dbc1dcd146302de6e4bc168dcee2b98713d18da2c82f9afff7efff6d5eb8990156a45fa569627dd0d9720c057383ad76001eacfe92a98d2fa02a4edfff3
+MISC ChangeLog 86042 SHA256 7d262a4f4bfe63b4de6f3096f7d1c76553b53e7a0dfe6e1cb9fade5b6a83b863 SHA512 8ac423b06a5d13688a55cd6d553cc850a8f2ed09ac3aad5c1c85eb45d26f3b60cb99708f334d3a6c9b91f1cc2dacefacd14b696bb20788f086affaec902f4a7e WHIRLPOOL 638864a7001476b4faddf1e570be8bc67ba780cd45f07ea0a84eff3e3ab5e995404d096051a6e0da7a7be78081c46316fdc7df06814ff368b7acd42ca7e6e607
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQIcBAEBCAAGBQJUVfgdAAoJEC7dUkA7aK9HfPMP/0uDQP1NZHzpXEn+klYfLMrg
-jDVwz2eivGcFyVBUOuYGnQ64cEeAc905vwZM0Tgi7K7cWiaRn39dhlnKkBA1quYv
-H+YrtUISyhcGjauEKqNBvCI6BGXl2cH8R3yLOSMJEsC4CftboW0v/cY+F/jbDM66
-00cUL5uKJ4DD3CdE3MI9E2PyKBKHwoSA9SUIzppOBGd2mxA4ipSik1OrOp3JGK5f
-V73rjkDSOe/NO2bm1RzQtJb9nj42vCysi9PtICJ7rCSLCiIACwHuE71qjUnUvkMW
-bVal1QuIHRV3WgCeMFZjPZXn2Atz1EaF4ladQ/Awz3amMepiXOeBx34sCB6jV2ae
-PcyKwgCLz2/vr0VOR15oxhBnAqFjgeVqWYAh2njbxv7mWrH5LFT73GeiYnEERzwx
-7mxHHfjHpd8FutQw0EcMDPZ0EfDqFo4qcUNj0yjFtftVVeULlY5ku5I94ZA03Dht
-Fm3j3p2pGq2GPmyvo4kH1FEPyC2Eudb6bhBKEzrNzulm/F4icDKG5GtsSPdOCKCR
-v379h1Wq1jbhc09pZwVGweH99cD2jEy8JskADsuqNzYviAKnJfsyM3q7bX9y9IwK
-CROIZc9LreCCjPFJwj+ih2OvFtgFxXn/nmbT8S8TYJ2cY3oEjf7iEoSfJFXgapid
-9no+H3PG1Ni4FGjBEOhi
-=u3uH
------END PGP SIGNATURE-----
diff --git a/net-nds/openldap/openldap-2.3.43-r3.ebuild b/net-nds/openldap/openldap-2.3.43-r3.ebuild
index d382348cb3dc..8918b82882f4 100644
--- a/net-nds/openldap/openldap-2.3.43-r3.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r3.ebuild,v 1.3 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r3.ebuild,v 1.4 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 	!minimal? (
 		odbc? ( dev-db/unixODBC )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 		berkdb? (
diff --git a/net-nds/openldap/openldap-2.3.43-r4.ebuild b/net-nds/openldap/openldap-2.3.43-r4.ebuild
index 5027576434f8..b276f33fb16d 100644
--- a/net-nds/openldap/openldap-2.3.43-r4.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r4.ebuild,v 1.3 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r4.ebuild,v 1.4 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 	!minimal? (
 		odbc? ( dev-db/unixODBC )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 		berkdb? (
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index 87fb033792cd..1f45380b29aa 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-2014 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.19 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.20 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs user
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index e7d8631eed7a..08f6248712ec 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-2014 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.19 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.20 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -34,7 +34,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index b5662c5f3fdf..4c1d6507cc0f 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-2014 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.18 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.19 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -34,7 +34,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
index dc10c99e895e..6de792704e2f 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-2014 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.18 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.19 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="3"
 
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.30.ebuild b/net-nds/openldap/openldap-2.4.30.ebuild
index ab6e883ac3ce..52936188540d 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-2014 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.14 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.15 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="3"
 
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (