Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug #198633

(Portage version: 2.1.4.4)

6 files changed, 22 insertions, 11 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index c77b6fe531cf..813b9c36fd00 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/bincimap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.46 2008/03/14 10:05:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.47 2008/03/15 22:58:44 halcy0n Exp $
+
+  15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> bincimap-1.2.11.ebuild,
+  bincimap-1.2.12.ebuild, bincimap-1.2.13.ebuild, bincimap-1.3.3.ebuild,
+  bincimap-1.3.4.ebuild:
+  Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug
+  #198633
 
   14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml,
   bincimap-1.2.11.ebuild, bincimap-1.2.12.ebuild, bincimap-1.2.13.ebuild:
diff --git a/net-mail/bincimap/bincimap-1.2.11.ebuild b/net-mail/bincimap/bincimap-1.2.11.ebuild
index 764675cfb0de..6579200c26b9 100644
--- a/net-mail/bincimap/bincimap-1.2.11.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.11.ebuild,v 1.8 2008/03/14 10:05:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.11.ebuild,v 1.9 2008/03/15 22:58:44 halcy0n Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	sys-process/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
+	net-mail/checkpassword
+	!virtual/imapd"
 
 PROVIDE="virtual/imapd"
 
diff --git a/net-mail/bincimap/bincimap-1.2.12.ebuild b/net-mail/bincimap/bincimap-1.2.12.ebuild
index 7c6edfd4b105..93aa89eedf04 100644
--- a/net-mail/bincimap/bincimap-1.2.12.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.12.ebuild,v 1.8 2008/03/14 10:05:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.12.ebuild,v 1.9 2008/03/15 22:58:44 halcy0n Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	sys-process/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
+	net-mail/checkpassword
+	!virtual/imapd"
 
 PROVIDE="virtual/imapd"
 
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
index b38dd079c385..14f43e530b2e 100644
--- a/net-mail/bincimap/bincimap-1.2.13.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.5 2008/03/14 10:05:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.6 2008/03/15 22:58:44 halcy0n Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	sys-process/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
+	net-mail/checkpassword
+	!virtual/imapd"
 
 PROVIDE="virtual/imapd"
 
diff --git a/net-mail/bincimap/bincimap-1.3.3.ebuild b/net-mail/bincimap/bincimap-1.3.3.ebuild
index b3ee8201b079..0bb9ae1869d5 100644
--- a/net-mail/bincimap/bincimap-1.3.3.ebuild
+++ b/net-mail/bincimap/bincimap-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.3.ebuild,v 1.6 2008/02/29 16:27:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.3.ebuild,v 1.7 2008/03/15 22:58:44 halcy0n Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	sys-process/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
+	net-mail/checkpassword
+	!virtual/imapd"
 
 PROVIDE="virtual/imapd"
 
diff --git a/net-mail/bincimap/bincimap-1.3.4.ebuild b/net-mail/bincimap/bincimap-1.3.4.ebuild
index 41dc20c16c78..62333ad4a90f 100644
--- a/net-mail/bincimap/bincimap-1.3.4.ebuild
+++ b/net-mail/bincimap/bincimap-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.4.ebuild,v 1.4 2008/02/29 16:27:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.4.ebuild,v 1.5 2008/03/15 22:58:44 halcy0n Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	sys-process/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
+	net-mail/checkpassword
+	!virtual/imapd"
 
 PROVIDE="virtual/imapd"