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

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

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 39df1ab111971890d208b53cf9930a2ef9803a21..454f5979a13dceb3d473e8fddc22582fa1a16558 100644 (file)
--- 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/Manifest b/net-mail/dovecot/Manifest
index 85ebff0ebf53a291d9a818e1944408ebba81aa98..3db19979e9c06479ad9b717bcaa24b0309719774 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -14,28 +14,28 @@ DIST dovecot-2.0.16.tar.gz 3317662 RMD160 dfe0cf2bbd211a07bb492c2f0d944a6a9f1c5f
 DIST dovecot-2.0.17.tar.gz 3329794 RMD160 108399bdaf0e03e013b78b79e39c5c8a5dd2f62d SHA1 4c12f1a074c52b17cb64fcc73c41f0a2820a88fe SHA256 3f0d4289067d2355b4ce4a00265bf2b4bf6540bca8fdcecfc6ad20611da145d2
 DIST dovecot-2.1-pigeonhole-d17f4a699ad2.tar.bz2 561774 RMD160 0b63b5c30e7f55a73f08a57ad46b6a057c80b56e SHA1 2b0f23c08ae5cb68f900f5ead806e1e8805a9fad SHA256 9d50aa1fcf339293ca99772062fc91d37cdd52514fd95360f3948c412c87f7ce
 DIST dovecot-2.1.rc3.tar.gz 3606163 RMD160 1435832d0cde74018855128554a3516f88061660 SHA1 956854d9afbc2e5c9d8525fe2c7776eafb19f7fa SHA256 ba1b7db99c87f15235643b48a24928515ee33d8764a769d7059ce9edf1dc09c8
-EBUILD dovecot-1.2.17.ebuild 8744 RMD160 1c40bc02a47f1bd32bab43c5a37129a53394bbe8 SHA1 5ecf16dbef283f4c0279aba519d129d45e7b2298 SHA256 8f086c275f79bda4f54e2c9b9758c8e636bee12e106748475acac0967238082e
-EBUILD dovecot-2.0.15.ebuild 8852 RMD160 d22cf98e15958acb6d414b6a6a56268e9f36f050 SHA1 ca3e304979825f8da066ffdf97d39e9a0be87d9f SHA256 5451118790e070c118639421aa834d8829e554578af514f1c1eb08a4395e6158
-EBUILD dovecot-2.0.16-r1.ebuild 8784 RMD160 f77f1e16ebaa8819387070acf2d1be84d5c7f7ea SHA1 2f7470cb0c53aa9a6badeb66e0e458ee24bb5799 SHA256 e66d6271f8b453e6fa62186db248e11900f7f7be4659662aa31c6e67f9abcdb5
-EBUILD dovecot-2.0.16.ebuild 8774 RMD160 26546711ce3221f744f2cf1162316a069a776445 SHA1 4062e369cbb851ce7fa8aa25fc3ba2ce378531ff SHA256 cc127a8f84def8c5daf4b922bb0c2785a972f0ee29b73db914c220a36e5cfbae
-EBUILD dovecot-2.0.17.ebuild 8781 RMD160 fa99b0ea7f9fa11072ad2da89adcb67df84034b6 SHA1 4c9469527577315b82f588349f6be11df0e7951d SHA256 1bef4e795878e15f0b5a006a5e58f573d6d4ab24220eda213c86da8e7fa9fe61
-EBUILD dovecot-2.1_rc3.ebuild 9352 RMD160 e668d02e059d606a2a9b8e3a861aa28baf3477ec SHA1 e0d4a2efc0a93f48455dbf03a3823135991b7e6c SHA256 79d4e4cf27cf3537d16b87f1ad8ecb1dd4682005783d655fde47232eccb9074a
-MISC ChangeLog 52249 RMD160 1948122086bf24847fd86df11dc60a824a7a3a12 SHA1 99755b9277102b91d7242fe0e736fc02d4247621 SHA256 6fc8cb288909043626ccbdcd549f588eb7032c51736cdf7cf1a9b47c79e2e9de
+EBUILD dovecot-1.2.17.ebuild 8779 RMD160 e7e72abbabba9b996c5c22b696064a9ea6be6e23 SHA1 abc5692a012d84b17efee7706fd53257106c9b37 SHA256 d98318a83549c639f579d039653a97ac1c41cd0da98f0d5524baa6a82593865d
+EBUILD dovecot-2.0.15.ebuild 8888 RMD160 cc5172a57be6bd944c3320ff46d305df49c85ac2 SHA1 6ccb2632f814a9a7c6e1b4db016fba99288915b8 SHA256 1ac5143e0384c8a4bdfa617aa5b59c66eef3104ca7818843836f073cebbcd69b
+EBUILD dovecot-2.0.16-r1.ebuild 8822 RMD160 c2ce983c76a557f04515118bcee8d716e5379dbb SHA1 36b29dc68f57fec8a314ffbfd82bacc0bd480fa3 SHA256 c542c8906b7f9f7baf7e13bbe1691b20b971b5a600898b0bf48319681ff271a2
+EBUILD dovecot-2.0.16.ebuild 8809 RMD160 be475bd89f87cf2bab857febd4d2de968069548d SHA1 de0d53be4f702a07b488dbf83f2a54d38d231f06 SHA256 fe0b1de7f5c9c274e55094365b1988596379120500b2862f2d5de9922af4ddd9
+EBUILD dovecot-2.0.17.ebuild 8819 RMD160 b901c8483bb468f54b9783dfdd2766d5edf4a8b3 SHA1 0469602356d4ea6a6dfa1d696428f189f5d23264 SHA256 195b1350353bdffa6f791d80be4ebf77eb5e3c7c5c6939e1acacb82f73edf4cf
+EBUILD dovecot-2.1_rc3.ebuild 9390 RMD160 d939e392411f14e17315a9b1f6474d2fa75736b3 SHA1 ad0507a8db5a507579e35d8a8bb0d711565a7c2f SHA256 b8fb00694097109b780809311131a686212e3675e4fce17ecc7f82734de88dd4
+MISC ChangeLog 52500 RMD160 ea49ed7e26e8e2d75ad3c378da77b1877c4bfa6c SHA1 6fd7fcd4ccd2c55df599d97a8db450623bbffd5b SHA256 79afa22f9180bab98f06acc0f57fdf10a2e73a5da0b5f39868a2c066d6a84bb7
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPB3T3AAoJEHfx8XVYajsf0sAP/1DanZdLF5hJb0COoER2Fhgu
-j9ojx4doJmScRAuHrUzpMC5ZpfJmXNHJdHiZa6jlpzQp1gLaMXkGy2XNoIB61zfF
-LqIcvK0ANuxURIBc8q8GWPiyGQpd/cSeYI624+zm6Ot6azJMVIkbey414D/J0H3u
-ZA/h+WwRiCXwbCpOlIVtxuKxAUa9S9QMrBWP3xpoAFcnUQKe+h0b1N7NMy7giFKZ
-foC/g15nCDB08m7VERd0baqCYxKdPVDL3zHTF0/VyQcZ7XLJpdi3Ov8p3Xg0gUcP
-3zO5CxYnLGB4cTsYLtTzDZ18dQ65bSif1GD11zmZ3LwTEoov5wAg9yFiag9U/A/r
-snyydqvTKdDBiKnxln7caxUeiRdJydt2UX2+raQ7/2ROoSo3fgmg4TPUV7VNrg7u
-dpA15y2+CTFupsws2IKr3iKW/BPkpO60pE3+FKmX4rtPvDNYZcMaRmLgQ9up+Tve
-8S1sz1t8tsrNcP3AUVymv8jJpAcTlmsYCFjKm4AsludtXj7HWtJEJst8Ok9R85eK
-P8XUlWak45DV5I4btzN0JXrVjf4TnRyxV6ofafMbYIdshZlJ168gaM3lfXPv6Ps/
-COxF1oNqqZbmaMlY3C9DRBkWzXPgMybeOLFLZq6gQJ19pcOgG2muV5T5VNECWqnO
-aa65HUBYrsJifAvIhHm0
-=dTJY
+iQIcBAEBCAAGBQJPC1QHAAoJEHfx8XVYajsfnDEP/0tbNS9CyTGVx4aBt3VWMTIk
+kpioIsrdG/oMob+HoNx3Uehs1c8pKmKdaymW3y21+0iYU20/00Y/Dq11+UMGbS7F
+EveVwSr3Z3WwWzgbFlm/d9Y+xq0H25Nd4EVJO26w2CudcRImCBKZ2Q7D9nj+FyBE
+yVLKPOWCM7Qx7GC2BtFGzls635p2SuYEuC/3ARya6efR1TMu03/pcOW4L8Br0ysR
+QKw4A05IK+fwUx7TQrTmkdzfi8wPs4OrkJ4HlPBMvuZTShIew9FXlN/cQ2vRpXgh
+mYGLk2H/bu29tVsJki6/OhSTPm3k2nvrdfWGTytg6x8M8x12oB1pw9YX8Xc6tbsC
+q9wzlAh5o80TaYe1wCcypZjpPh5uP2823WNvcaTlVpWrAHkElCxIw9PX1om/mJVb
+M16SyoC/7G/ilNylVfJVSp8rsAjcygiqAJ6kzT5QRr8NJLrZdmoeP1ATRRSVdMNG
+oK5u9v0hJQEx/s21zJbQbPnQ5MDWCLBLleGJWW9YOyWcCIyP/PedYZE8zuM8Tig7
+cuyTlflRvUF+vZwf+XA5MF11ktAO16PulfyNy7b6TiKqRU9zTNjNwGqcGvMhKDhX
+/MirSoHpCFj3oUV4dTnZnnw9PegNpXJGxYkBgce9LympyXw2sw+tCNkSET7iMndn
+z6zG1miIy8qOyj1gYz5I
+=Mx5I
 -----END PGP SIGNATURE-----

diff --git a/net-mail/dovecot/dovecot-1.2.17.ebuild b/net-mail/dovecot/dovecot-1.2.17.ebuild
index a66c0d1253c92853ceb863d65f452f4163ae9470..dbed793fb1232ad2e27083e2325958fddfb9b0ee 100644 (file)
--- 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 21a7b915794aa0d7981d22c443edfe8a899ca00e..e1521785dd068a65c1129d92c3e0d8503f2297a1 100644 (file)
--- 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 7cb3cce57c1b94705b94e9b66b620d54aaf72a67..1672a74272bdd88e43d36dddf8cf1e8e10918769 100644 (file)
--- 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 4831478ad7a517a035657ada6f98f63e6bee8d71..2c490a7e48cd6c8b6c87eefa03d4c1e876745861 100644 (file)
--- 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 916fc97679cd6460972cfb054be0a4ae03e14663..3a1baaf575fb09d9aa6ea68f0d442de09f8a2a0a 100644 (file)
--- 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 9afed22c46272580442586f3220294838218371e..f109c2408633af163afb2565520c15b9fabc7577 100644 (file)
--- 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 )