remove old style virtual/imapd

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 34 insertions, 15 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 160da826b079..cad0aee8b70b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.156 2011/01/10 13:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.157 2011/03/19 17:00:38 eras Exp $
+
+  19 Mar 2011; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.3.14-r3.ebuild,
+  cyrus-imapd-2.3.15.ebuild, cyrus-imapd-2.3.16.ebuild:
+  remove old style virtual/imapd
 
   10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   cyrus-imapd-2.3.16.ebuild, +files/cyrus-imapd-2.3.16+db-5.0.patch:
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
index 373e7e5769bf..7adb92bd1fe9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.14-r3.ebuild,v 1.9 2009/12/27 09:36:56 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.10 2011/03/19 17:00:38 eras Exp $
 
 EAPI=1
 
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="idled kerberos kolab nntp pam replication +sieve snmp ssl tcpd"
 
-PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-libs/cyrus-sasl-2.1.13
 	pam? (
@@ -37,8 +36,14 @@ DEPEND="$RDEPEND
 	>=sys-devel/autoconf-2.58
 	sys-devel/automake"
 
-RDEPEND="$RDEPEND
-	!virtual/imapd"
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
 
 new_net-snmp_check() {
 	# tcpd USE flag check. Bug #68254.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.15.ebuild
index 63feb8f50368..3be438e706b5 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.15.ebuild,v 1.1 2009/11/22 13:59:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.15.ebuild,v 1.2 2011/03/19 17:00:38 eras Exp $
 
 EAPI=1
 
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="idled kerberos nntp pam replication +sieve snmp ssl tcpd"
 
-PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-libs/cyrus-sasl-2.1.13
 	pam? (
@@ -36,8 +35,14 @@ DEPEND="$RDEPEND
 	>=sys-devel/autoconf-2.58
 	sys-devel/automake"
 
-RDEPEND="$RDEPEND
-	!virtual/imapd"
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
 
 new_net-snmp_check() {
 	# tcpd USE flag check. Bug #68254.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild
index d9fc57e85503..131b410c506e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.16.ebuild,v 1.2 2011/01/10 13:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.16.ebuild,v 1.3 2011/03/19 17:00:38 eras Exp $
 
 EAPI=1
 
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="idled kerberos nntp pam replication +sieve snmp ssl tcpd"
 
-PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-libs/cyrus-sasl-2.1.13
 	pam? (
@@ -36,8 +35,14 @@ DEPEND="$RDEPEND
 	>=sys-devel/autoconf-2.58
 	sys-devel/automake"
 
-RDEPEND="$RDEPEND
-	!virtual/imapd"
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
 
 new_net-snmp_check() {
 	# tcpd USE flag check. Bug #68254.