net-mail/cyrus-imapd: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 38 insertions, 34 deletions

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
index ef409df0114d..824794bbbc35 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
index b64e165b3a8e..471ab7129ca9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
index fb391be37dcf..9346b47b1dab 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
@@ -31,10 +31,10 @@ CDEPEND="
 	http? (
 		dev-libs/libxml2:2
 		dev-libs/libical:=
-		net-libs/nghttp2
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
index 5df5b8a089db..9d13260102be 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
@@ -30,11 +30,11 @@ CDEPEND="
 	clamav? ( app-antivirus/clamav )
 	http? (
 		dev-libs/libxml2:2
-		dev-libs/libical:0=
-		net-libs/nghttp2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
index 6f4377b85644..fd888906a05d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="dev-libs/libpcre:3
 		sci-libs/shapelib:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (