Add calculate_noldap flag

app-misc/cds-meta/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cds-meta-11.6-r1 (03 Jun 2011)
+
+  03 Jun 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+  -cds-meta-11.6.ebuild, +cds-meta-11.6-r1.ebuild:
+  Add calculate_noldap flag
+
 *cds-meta-11.6 (18 May 2011)
 
   18 May 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

app-misc/cds-meta/Manifest

@@ -1,3 +1,3 @@
-EBUILD cds-meta-11.6.ebuild 1663 RMD160 3d737a058529eaf92b9902673f66f99642547284 SHA1 81b7a8e914cf65b6ff3e23225ab13d08c6a8c10a SHA256 76803cfcfd21f97f041f66454ad34aef766bd64c964330f519e6c74205c05cc2
-MISC ChangeLog 2127 RMD160 3a8ef16cfc9cd73ee92acb218e63e2e975ca9793 SHA1 876985c88f27491b326ca3e69fafb917d429722f SHA256 12d3b3b6077f935e1b481dc5e668481a92d65e18c9056df844b5a88dfdefd55f
+EBUILD cds-meta-11.6-r1.ebuild 1674 RMD160 46d77ff68a5acc09fb70690be8c38134975d6e9d SHA1 a432affb1102155167c43395592a8819b7f8908d SHA256 110576be6f122be76600947e489155819248d4797c1e62f91e2b756b288e1919
+MISC ChangeLog 2305 RMD160 8a873b391d03c9b0e5639893f2f4548a6aabdb67 SHA1 6d14a2681824a2de10ca7ea7282f8bee53ee1ef2 SHA256 f01d145b09737153d0602ebe2099d9dcfbe23c36b31673d81ebe5fef3f6d2661
 MISC metadata.xml 260 RMD160 6945f0c9b210fe3068c6e5a6f7d5071cf9043369 SHA1 49f5ce48babea34bb39ff3f0d9d7c3adf9665da2 SHA256 74bbb85f1ec54eab72a905a78ffd5ac51bc7c3f64e9731418aa68f773d2bfba8

app-misc/cds-meta/cds-meta-11.6-r1.ebuild

@@ -22,6 +22,7 @@ calculate_nobittorrent
 calculate_nodhcp
 calculate_noftp
 calculate_nojabber
+calculate_noldap
 calculate_nomail
 calculate_nomysql
 calculate_nonamed
@@ -55,6 +56,7 @@ RDEPEND="${RDEPEND}
 		net-ftp/proftpd
 	)
 	!calculate_nojabber? ( net-im/ejabberd )
+	!calculate_noldap? ( net-nds/openldap )
 	!calculate_nomail? (
 		mail-filter/clamsmtp
 		mail-filter/postgrey
@@ -73,7 +75,3 @@ RDEPEND="${RDEPEND}
 	)
 "
 
-# LDAP
-RDEPEND="${RDEPEND}
-	net-nds/openldap
-"

app-misc/cl-tools-meta/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cl-tools-meta-11.6-r3 (03 Jun 2011)
+
+  03 Jun 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+  -cl-tools-meta-11.6-r2.ebuild, +cl-tools-meta-11.6-r3.ebuild:
+  Add calculate_noldap flag
+
 *cl-tools-meta-11.6 (18 May 2011)
 
   18 May 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

app-misc/cl-tools-meta/Manifest

@@ -1,2 +1,2 @@
-EBUILD cl-tools-meta-11.6-r2.ebuild 3173 RMD160 cb2d4ab634bfb344f42b88514d52ae338198f0ac SHA1 54f45cf6c6e1e349986be616e039db63a3d8fc1c SHA256 253b7cc4f7829087e88ef0e37a4d4a6b2b06140a6fef2342d4a8b3a23677c5be
-MISC ChangeLog 3451 RMD160 3e0e7f89659588c6c8b237c5112cc33505c5da21 SHA1 dd286929310a7ff9d59b519b413a5dcc8c3934b7 SHA256 7d7a28c84f085dff4ffc37177153a903992103bf893cbd86cf665501a07e675c
+EBUILD cl-tools-meta-11.6-r3.ebuild 3220 RMD160 c0b1baa8b9adf99bb3b43af670bef404086300c4 SHA1 1d7731e76ccc4463c518ee119fb1b1d80243801e SHA256 02bae38a7dde81ec622e89a2793ebe73bcc6c5b9b8f1c2eb1d6f5ae6196176a8
+MISC ChangeLog 3647 RMD160 7f5474c06b1c4a5f291fd5cf3f397d80ec89caa5 SHA1 f4f46efef8c0b2071af72f66e53ef9d2230aba4b SHA256 91b6852aeb6ebfd31ea2d8bc7288450df8ca94a47b821bbd8d2452b50ddcb093

app-misc/cl-tools-meta/cl-tools-meta-11.6-r3.ebuild

@@ -21,6 +21,7 @@ IUSE="
 	cdistro_CMC
 	calculate_noantivirus
 	calculate_noarch
+	calculate_noldap
 	calculate_nopgsql
 	calculate_nosamba
 "
@@ -123,8 +124,10 @@ RDEPEND="${RDEPEND}
 		sys-apps/pv
 		sys-apps/smartmontools
 		sys-apps/usbutils
-		sys-auth/nss_ldap
-		sys-auth/pam_ldap
+		!calculate_noldap? (
+			sys-auth/nss_ldap
+			sys-auth/pam_ldap
+		)
 		sys-block/parted
 		sys-block/tw_cli
 		sys-fs/dmraid