diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2008-03-15 23:14:05 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2008-03-15 23:14:05 +0000 |
| commit | 0e8f61b0958acca2f1e3c49d99782a3459a72157 (patch) | |
| tree | 7c84c45af056c1379b14a3bd5d892f684212d32d /net-mail/cyrus-imapd | |
| parent | Sparc stable --- Bug #213500 --- All 45751 tests good and running well for (diff) | |
| download | gentoo-2-0e8f61b0958acca2f1e3c49d99782a3459a72157.tar.gz gentoo-2-0e8f61b0958acca2f1e3c49d99782a3459a72157.tar.bz2 gentoo-2-0e8f61b0958acca2f1e3c49d99782a3459a72157.zip | |
Add a blocker in RDEPEND on virtual/imapd so we avoid manpage collisions; bug #198633
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-mail/cyrus-imapd')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild | 5 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 786e0cac9f6a..c00a1c7c88bc 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.123 2008/03/15 18:00:40 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.124 2008/03/15 23:14:05 halcy0n Exp $ + + 15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> cyrus-imapd-2.3.9-r1.ebuild, + cyrus-imapd-2.3.11.ebuild: + Add a blocker in RDEPEND on virtual/imapd so we avoid manpage collisions; + bug #198633 15 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> cyrus-imapd-2.3.11.ebuild: diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild index 4f2e27b6f3d5..e86de7b2417c 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.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/cyrus-imapd/cyrus-imapd-2.3.11.ebuild,v 1.4 2008/03/15 18:00:40 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.11.ebuild,v 1.5 2008/03/15 23:14:05 halcy0n Exp $ inherit autotools eutils ssl-cert fixheadtails pam @@ -37,6 +37,9 @@ DEPEND="$RDEPEND >=sys-devel/autoconf-2.58 sys-devel/automake" +RDEPEND="$RDEPEND + !virtual/imapd" + new_net-snmp_check() { # tcpd USE flag check. Bug #68254. if use tcpd ; then diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild index 0f504521239a..5266492641e2 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.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/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild,v 1.10 2008/03/13 21:08:43 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild,v 1.11 2008/03/15 23:14:05 halcy0n Exp $ inherit autotools eutils ssl-cert fixheadtails pam @@ -36,6 +36,9 @@ DEPEND="$RDEPEND >=sys-devel/autoconf-2.58 sys-devel/automake" +RDEPEND="$RDEPEND + !virtual/imap" + new_net-snmp_check() { # tcpd USE flag check. Bug #68254. if use tcpd ; then |