summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean Bailey <alron@gentoo.org>2003-02-10 02:36:12 +0000
committerDean Bailey <alron@gentoo.org>2003-02-10 02:36:12 +0000
commita30eaa8ece771fc7c80414fc7f616b28f7994ba7 (patch)
tree97b7cf74a36af757d53c1cb29ddb26271e757923 /net-mail/uw-imap
parentinitial import of vimap, a modified uw-imap with Linuxconf style Virtual Doma... (diff)
downloadhistorical-a30eaa8ece771fc7c80414fc7f616b28f7994ba7.tar.gz
historical-a30eaa8ece771fc7c80414fc7f616b28f7994ba7.tar.bz2
historical-a30eaa8ece771fc7c80414fc7f616b28f7994ba7.zip
added conflict for net-mail/vimap to uw-imap-2001a-r3 and uw-imap-2002b
Diffstat (limited to 'net-mail/uw-imap')
-rw-r--r--net-mail/uw-imap/ChangeLog6
-rw-r--r--net-mail/uw-imap/uw-imap-2001a-r3.ebuild5
-rw-r--r--net-mail/uw-imap/uw-imap-2002b.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index fb4346836153..293148079534 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for net-mail/uw-imap
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.10 2003/01/12 22:47:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.11 2003/02/10 02:36:12 alron Exp $
+ 09 Feb 2003; Dean Bailey <alron@gentoo.org> uw-imap-2002b.ebuild,
+ uw-imap-2001a-r3.ebuild :
+ Added !net-mail/vimap conflict.
+
*uw-imap-2002b (12 Jan 2003)
12 Jan 2003; Nick Hadaway <raker@gentoo.org> uw-imap-2002b.ebuild,
diff --git a/net-mail/uw-imap/uw-imap-2001a-r3.ebuild b/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
index d1d19dee31a2..d134969ed4eb 100644
--- a/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
+++ b/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2001a-r3.ebuild,v 1.6 2002/12/09 04:33:15 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2001a-r3.ebuild,v 1.7 2003/02/10 02:36:12 alron Exp $
PN0=imap
S=${WORKDIR}/${PN0}-${PV}
@@ -15,7 +15,8 @@ KEYWORDS="x86 sparc "
IUSE="ssl mbox"
PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
+DEPEND="!net-mail/vimap
+ virtual/glibc
>=sys-libs/pam-0.72
ssl? ( dev-libs/openssl )"
diff --git a/net-mail/uw-imap/uw-imap-2002b.ebuild b/net-mail/uw-imap/uw-imap-2002b.ebuild
index 36f42307df51..cb5a53d3ac27 100644
--- a/net-mail/uw-imap/uw-imap-2002b.ebuild
+++ b/net-mail/uw-imap/uw-imap-2002b.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002b.ebuild,v 1.1 2003/01/12 22:47:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002b.ebuild,v 1.2 2003/02/10 02:36:12 alron Exp $
S=${WORKDIR}/imap-2002b
@@ -14,7 +14,8 @@ KEYWORDS="~x86 ~sparc ~ppc"
IUSE="ssl mbox"
PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
+DEPEND="!net-mail/vimap
+ virtual/glibc
>=sys-libs/pam-0.72
ssl? ( dev-libs/openssl )"