diff options
author | Mark Loeser <halcy0n@gentoo.org> | 2008-03-15 23:07:48 +0000 |
---|---|---|
committer | Mark Loeser <halcy0n@gentoo.org> | 2008-03-15 23:07:48 +0000 |
commit | ba39f7a17ed6bda7bf8a8585896ac3ac6680fe5d (patch) | |
tree | e6206af8af8f47aa0ec6ecea256e4f377f9fa415 /net-mail/courier-imap | |
parent | amd64 stable wrt bug #209465 (diff) | |
download | gentoo-2-ba39f7a17ed6bda7bf8a8585896ac3ac6680fe5d.tar.gz gentoo-2-ba39f7a17ed6bda7bf8a8585896ac3ac6680fe5d.tar.bz2 gentoo-2-ba39f7a17ed6bda7bf8a8585896ac3ac6680fe5d.zip |
Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug #198633
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-mail/courier-imap')
-rw-r--r-- | net-mail/courier-imap/ChangeLog | 11 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-3.0.8.ebuild | 7 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild | 6 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild | 6 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.0.1.ebuild | 6 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.0.4.ebuild | 6 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild | 6 | ||||
-rw-r--r-- | net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild | 6 |
8 files changed, 38 insertions, 16 deletions
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog index 33640194226e..7d1786ab2207 100644 --- a/net-mail/courier-imap/ChangeLog +++ b/net-mail/courier-imap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-mail/courier-imap -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.157 2007/07/02 14:54:21 peper Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.158 2008/03/15 23:07:48 halcy0n Exp $ + + 15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> courier-imap-3.0.8.ebuild, + courier-imap-4.0.1.ebuild, courier-imap-4.0.1-r1.ebuild, + courier-imap-4.0.1-r2.ebuild, courier-imap-4.0.4.ebuild, + courier-imap-4.0.6-r2.ebuild, courier-imap-4.1.2-r1.ebuild: + Add a blocker in RDEPEND on virtual/imap so we avoid manpage collisions; bug + #198633 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> courier-imap-3.0.8.ebuild, courier-imap-4.0.1.ebuild, diff --git a/net-mail/courier-imap/courier-imap-3.0.8.ebuild b/net-mail/courier-imap/courier-imap-3.0.8.ebuild index 9dc089d0138f..2e46bd24dcd9 100644 --- a/net-mail/courier-imap/courier-imap-3.0.8.ebuild +++ b/net-mail/courier-imap/courier-imap-3.0.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.24 2007/07/14 22:22:19 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.ebuild,v 1.25 2008/03/15 23:07:48 halcy0n Exp $ inherit eutils @@ -31,6 +31,9 @@ DEPEND="${RDEPEND} dev-lang/perl sys-process/procps !mail-mta/courier" +RDEPEND="${RDEPEND} + !virtual/imapd" + PROVIDE="virtual/imapd" pkg_setup() { diff --git a/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild b/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild index 7ff4a4be3c9c..01158551f0b1 100644 --- a/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild +++ b/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild,v 1.7 2007/07/02 14:54:21 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild,v 1.8 2008/03/15 23:07:48 halcy0n Exp $ inherit eutils IUSE="fam berkdb gdbm debug ipv6 nls selinux" @@ -29,6 +29,8 @@ DEPEND="${RDEPEND} dev-lang/perl sys-process/procps !mail-mta/courier" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" #S=${WORKDIR}/${PN}-${MY_PV} diff --git a/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild b/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild index 91b3938f2ea5..e694328ed7ef 100644 --- a/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild +++ b/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild,v 1.7 2007/07/02 14:54:21 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1-r2.ebuild,v 1.8 2008/03/15 23:07:48 halcy0n Exp $ inherit eutils IUSE="fam berkdb gdbm debug ipv6 nls selinux" @@ -30,6 +30,8 @@ DEPEND="${RDEPEND} dev-lang/perl sys-process/procps !mail-mta/courier" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" #S=${WORKDIR}/${PN}-${MY_PV} diff --git a/net-mail/courier-imap/courier-imap-4.0.1.ebuild b/net-mail/courier-imap/courier-imap-4.0.1.ebuild index 30e693a5040e..5e45fbfd0318 100644 --- a/net-mail/courier-imap/courier-imap-4.0.1.ebuild +++ b/net-mail/courier-imap/courier-imap-4.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1.ebuild,v 1.14 2007/07/02 14:54:21 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1.ebuild,v 1.15 2008/03/15 23:07:48 halcy0n Exp $ inherit eutils @@ -29,6 +29,8 @@ DEPEND="${RDEPEND} sys-process/procps >=net-libs/courier-authlib-0.50 !mail-mta/courier" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" #S=${WORKDIR}/${PN}-${MY_PV} diff --git a/net-mail/courier-imap/courier-imap-4.0.4.ebuild b/net-mail/courier-imap/courier-imap-4.0.4.ebuild index 4f353273adc5..18192317d1a1 100644 --- a/net-mail/courier-imap/courier-imap-4.0.4.ebuild +++ b/net-mail/courier-imap/courier-imap-4.0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.4.ebuild,v 1.16 2007/07/02 14:54:21 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.4.ebuild,v 1.17 2008/03/15 23:07:48 halcy0n Exp $ inherit eutils IUSE="fam berkdb gdbm debug ipv6 nls selinux" @@ -29,6 +29,8 @@ DEPEND="${RDEPEND} dev-lang/perl userland_GNU? ( sys-process/procps ) !mail-mta/courier" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" RC_VER="4.0.1-r1" diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild index a552ca6551a2..ac90df7a42c9 100644 --- a/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild +++ b/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild,v 1.11 2007/06/24 22:08:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r2.ebuild,v 1.12 2008/03/15 23:07:48 halcy0n Exp $ inherit autotools eutils multilib @@ -27,6 +27,8 @@ DEPEND="${RDEPEND} dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps )" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" diff --git a/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild index feef9c30b050..29af83ceb778 100644 --- a/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild +++ b/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild,v 1.2 2007/06/12 12:12:32 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2-r1.ebuild,v 1.3 2008/03/15 23:07:48 halcy0n Exp $ inherit autotools eutils multilib @@ -27,6 +27,8 @@ DEPEND="${RDEPEND} dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps )" +RDEPEND="${RDEPEND} + !virtual/imapd" PROVIDE="virtual/imapd" |