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

Package-Manager: portage-2.1.4.4

7 files changed, 31 insertions, 20 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/Manifest b/net-mail/bincimap/Manifest
index bc60fc7943e2..98e74a559d61 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -11,17 +11,17 @@ DIST bincimap-1.2.12final.tar.bz2 415731 RMD160 67327046c6b4e795c916bf4a0fc2cb0a
 DIST bincimap-1.2.13final.tar.bz2 416152 RMD160 db5821290cdc193f594181105a41e64b8c975b4e SHA1 cdbc1bf95decbe76e0a218025c351b8174b4b485 SHA256 152368a1674a521a2006b8a27ff36c4db1b8bb0cf766ab1a0ada02698fae4528
 DIST bincimap-1.3.3.tar.bz2 192389 RMD160 b2b80c8b57e4a8d4f4f42aef1baa253a657f31c1 SHA1 afd35d811207619416e0d868a14a5aaf6ce06835 SHA256 07468bcbaaa4eaf74bf76a5a11fa6ebf0349e2156a8ec18e1dbddb04f587439d
 DIST bincimap-1.3.4.tar.bz2 194486 RMD160 9ed00b603c3c9c724eb0fe339d4ddeab719f78f2 SHA1 57e984428e897012ae907a7e915b8588967d2a45 SHA256 01c4426870167ada90be52cb73f220e04d715b4d95e734505f0e16d5ab99b066
-EBUILD bincimap-1.2.11.ebuild 2424 RMD160 3437e5be01a71d1b566ffda1bd91197e1eada8d8 SHA1 a48d0639d804f69a0bf328dc1e4e140cb7ab7d23 SHA256 9ccaecc3dc28ac71bcfa5a654175cebcc3ba0eb38cf3097f29ada5698f484677
-EBUILD bincimap-1.2.12.ebuild 2430 RMD160 82f29987febf25bdfb8786260ee5a7a3e43a9434 SHA1 8eff1c9dbd6ea91622874a8157a83649a14df31c SHA256 a3c8aa94d64778368a5f51d0b87b1480c9262f0ab143d717accf83aa82e6cdee
-EBUILD bincimap-1.2.13.ebuild 2432 RMD160 f0295970f261484d72c4e46233c434aec03c7d59 SHA1 5739b2a018b108a35fb10c8d1c66c58a4ad72cd7 SHA256 a95850d878f5abd4c4447b1ca6fb18db06871850ebf8f46f880caa4a2409284a
-EBUILD bincimap-1.3.3.ebuild 2470 RMD160 cd522a5b62f27c80b52fd7cfdd4783706e74debd SHA1 f25bfd9897d8d5d1dd56bb6f5f8cc1144afe54dd SHA256 3d9d43354ac39d1d7f1536810368799b8a2b72ef59f0e149b9c3da89ce2c10a8
-EBUILD bincimap-1.3.4.ebuild 2470 RMD160 4e35f268324f1f6bf2e14c70bd625ffee0dccaa8 SHA1 043e2aedd60a5e3d42e2947e45d3288a3468e252 SHA256 14065ef9e146a33f79a39bfc28819427e2513840af70c7a295a505cada8d80dd
-MISC ChangeLog 6839 RMD160 f91cda6cdbedcef74106d0a5de6b8d7239c79806 SHA1 9fd1e2570e72282675493551bb03776cc64e5c03 SHA256 4096e89cf211236898d2a71be5691e54f90c30ccae417f96852063b2d9ce379b
+EBUILD bincimap-1.2.11.ebuild 2441 RMD160 f13953b86eb1978c43ea3df4ba5466e2d646333a SHA1 453f30c5f5835d7c6e318c3932ce43da0a32069f SHA256 52c0b4a2c36ceb1ddadf8867d676ba300c12582d9cb79f0e40effcd2c553cb65
+EBUILD bincimap-1.2.12.ebuild 2447 RMD160 536561885550874980c7cd4bab071f240b4b0a8d SHA1 befc9720ac38e5da9347d8a67e1d0dbe21c0a9d5 SHA256 8ac7e86c3a7c5a98060efb4a19706c7d29e819a91f09d5c882b686213c83e240
+EBUILD bincimap-1.2.13.ebuild 2449 RMD160 d91f7a9f84859d5afec67b42b56e038099fbb960 SHA1 d59a2880744b9b2957a33566629f64982803db49 SHA256 53227f878a0096da3d4ec7409f50f70a6eb30343205d526722298512820ac4d7
+EBUILD bincimap-1.3.3.ebuild 2490 RMD160 56f1e615d1185e9f9c8acf99a1cc1edce6f7716d SHA1 28fb9360416992002dff5d4a2faf214d9c25f3eb SHA256 f41fecf098ab5370b585ae6646b7b19135824d80a3c8dfa76f890a7ef864a58f
+EBUILD bincimap-1.3.4.ebuild 2490 RMD160 cbfa86f1a7da93b92ecf0b1cc2039e259f1a05e8 SHA1 f1eb7d7a45286ad2a12992a536e9d79d0d85a92a SHA256 324cd4a8cdb7913083c3f313188df44c42e4c63d279c33010934fde46aadfc19
+MISC ChangeLog 7100 RMD160 51b797fbd9e74c8a404017c813a72b8302b7bf5d SHA1 eaab95a21ca390e4224699d8c1488b3cc909d576 SHA256 52618d5fbb2aef187fb0b8fac027bef78a4aeb184d992f2065db251a8efe57d3
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH2k3uyuNVb5qfaOYRAt2TAJ4hTHgfuITx3Gv0I3fU52wiLjEerQCgq93c
-TdtD7UC3bezKawxLEGoj2XY=
-=sXzP
+iD8DBQFH3FSsCRZPokWLroQRAtnOAJ91hcv/pRtf3/ZBhjIdtTQyQImsRQCgojfr
+r0xnIhuhsCz0y+j/WQDUdwU=
+=WreI
 -----END PGP SIGNATURE-----
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"