block against postgresql-base[ldap,threads] - bug #396691

(Portage version: 2.1.10.44/cvs/Linux x86_64)

7 files changed, 22 insertions, 17 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 39df1ab11197..454f5979a13d 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.336 2012/01/06 22:25:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.337 2012/01/09 20:54:14 eras Exp $
+
+  09 Jan 2012; Eray Aslan <eras@gentoo.org> dovecot-1.2.17.ebuild,
+  dovecot-2.0.15.ebuild, dovecot-2.0.16.ebuild, dovecot-2.0.16-r1.ebuild,
+  dovecot-2.0.17.ebuild, dovecot-2.1_rc3.ebuild:
+  block against postgresql-base[ldap,threads] - bug #396691
 
 *dovecot-2.1_rc3 (06 Jan 2012)
 
diff --git a/net-mail/dovecot/dovecot-1.2.17.ebuild b/net-mail/dovecot/dovecot-1.2.17.ebuild
index a66c0d1253c9..dbed793fb123 100644
--- a/net-mail/dovecot/dovecot-1.2.17.ebuild
+++ b/net-mail/dovecot/dovecot-1.2.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.17.ebuild,v 1.5 2011/05/28 16:48:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.17.ebuild,v 1.6 2012/01/09 20:54:14 eras Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ DEPEND="berkdb? ( sys-libs/db )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )"
diff --git a/net-mail/dovecot/dovecot-2.0.15.ebuild b/net-mail/dovecot/dovecot-2.0.15.ebuild
index 21a7b915794a..e1521785dd06 100644
--- a/net-mail/dovecot/dovecot-2.0.15.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.15.ebuild,v 1.5 2011/11/05 21:25:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.15.ebuild,v 1.6 2012/01/09 20:54:14 eras Exp $
 
 EAPI="3"
 
@@ -30,7 +30,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.0.16-r1.ebuild b/net-mail/dovecot/dovecot-2.0.16-r1.ebuild
index 7cb3cce57c1b..1672a74272bd 100644
--- a/net-mail/dovecot/dovecot-2.0.16-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.16-r1.ebuild,v 1.4 2011/11/28 10:56:14 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.16-r1.ebuild,v 1.5 2012/01/09 20:54:14 eras Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.0.16.ebuild b/net-mail/dovecot/dovecot-2.0.16.ebuild
index 4831478ad7a5..2c490a7e48cd 100644
--- a/net-mail/dovecot/dovecot-2.0.16.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.16.ebuild,v 1.11 2011/12/18 21:56:27 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.16.ebuild,v 1.12 2012/01/09 20:54:14 eras Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.0.17.ebuild b/net-mail/dovecot/dovecot-2.0.17.ebuild
index 916fc97679cd..3a1baaf575fb 100644
--- a/net-mail/dovecot/dovecot-2.0.17.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.17.ebuild,v 1.1 2012/01/06 21:46:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.17.ebuild,v 1.2 2012/01/09 20:54:14 eras Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.1_rc3.ebuild b/net-mail/dovecot/dovecot-2.1_rc3.ebuild
index 9afed22c4627..f109c2408633 100644
--- a/net-mail/dovecot/dovecot-2.1_rc3.ebuild
+++ b/net-mail/dovecot/dovecot-2.1_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild,v 1.1 2012/01/06 22:25:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc3.ebuild,v 1.2 2012/01/09 20:54:14 eras Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
+	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
 	sqlite? ( dev-db/sqlite )
 	ssl? ( dev-libs/openssl )
 	vpopmail? ( net-mail/vpopmail )