remove old style virtual/imapd

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

7 files changed, 68 insertions, 32 deletions

diff --git a/net-mail/bincimap/bincimap-1.2.12.ebuild b/net-mail/bincimap/bincimap-1.2.12.ebuild
index 024e27c13167..7f653306bf6d 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-2011 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.11 2011/02/07 10:57:11 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.12.ebuild,v 1.12 2011/03/19 17:11:35 eras Exp $
 
 inherit eutils
 
@@ -17,10 +17,16 @@ DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
 	virtual/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword
-	!virtual/imapd"
-
-PROVIDE="virtual/imapd"
+	net-mail/checkpassword"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
 
 S="${WORKDIR}/${P}final"
 
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
index 9af00af5f31d..e33f4f324acf 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-2011 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.11 2011/02/07 10:57:11 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.12 2011/03/19 17:11:35 eras Exp $
 
 inherit eutils
 
@@ -17,10 +17,16 @@ DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
 	virtual/daemontools
 	sys-apps/ucspi-tcp
-	net-mail/checkpassword
-	!virtual/imapd"
-
-PROVIDE="virtual/imapd"
+	net-mail/checkpassword"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
 
 S="${WORKDIR}/${P}final"
 
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 06c08b9dcaa8..6ec66442cb76 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/courier-imap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.186 2010/07/01 11:51:11 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.187 2011/03/19 17:08:45 eras Exp $
+
+  19 Mar 2011; Eray Aslan <eras@gentoo.org> courier-imap-4.0.6-r3.ebuild,
+  courier-imap-4.5.0.ebuild, courier-imap-4.6.0.ebuild,
+  courier-imap-4.8.0.ebuild:
+  remove old style virtual/imapd
 
   01 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
   courier-imap-4.8.0.ebuild:
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r3.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r3.ebuild
index dec0e6d33102..f8a95d551c1b 100644
--- a/net-mail/courier-imap/courier-imap-4.0.6-r3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/courier-imap/courier-imap-4.0.6-r3.ebuild,v 1.9 2010/02/15 19:42:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r3.ebuild,v 1.10 2011/03/19 17:08:45 eras Exp $
 
 inherit autotools eutils multilib
 
@@ -27,10 +27,14 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 		!mail-mta/courier
 		userland_GNU? ( sys-process/procps )"
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
 RDEPEND="${RDEPEND}
-		!virtual/imapd"
-
-PROVIDE="virtual/imapd"
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-4.5.0.ebuild b/net-mail/courier-imap/courier-imap-4.5.0.ebuild
index 8249fa6ed989..28bb86faa242 100644
--- a/net-mail/courier-imap/courier-imap-4.5.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/courier-imap/courier-imap-4.5.0.ebuild,v 1.10 2010/02/15 19:42:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.5.0.ebuild,v 1.11 2011/03/19 17:08:45 eras Exp $
 
 inherit autotools eutils multilib libtool
 
@@ -28,10 +28,15 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 		!mail-mta/courier
 		userland_GNU? ( sys-process/procps )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
 
-PROVIDE="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/cyrus-imapd
+	!net-mail/uw-imap"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-4.6.0.ebuild b/net-mail/courier-imap/courier-imap-4.6.0.ebuild
index 9314a0fb6d34..46aba72e035c 100644
--- a/net-mail/courier-imap/courier-imap-4.6.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/courier-imap/courier-imap-4.6.0.ebuild,v 1.3 2010/02/15 19:42:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.6.0.ebuild,v 1.4 2011/03/19 17:08:45 eras Exp $
 
 EAPI=2
 inherit autotools eutils multilib libtool
@@ -26,10 +26,15 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 		!mail-mta/courier
 		userland_GNU? ( sys-process/procps )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
 
-PROVIDE="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/cyrus-imapd
+	!net-mail/uw-imap"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"
diff --git a/net-mail/courier-imap/courier-imap-4.8.0.ebuild b/net-mail/courier-imap/courier-imap-4.8.0.ebuild
index 9d6874dbaa3d..edb58990a859 100644
--- a/net-mail/courier-imap/courier-imap-4.8.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/courier-imap/courier-imap-4.8.0.ebuild,v 1.2 2010/07/01 11:51:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0.ebuild,v 1.3 2011/03/19 17:08:45 eras Exp $
 
 EAPI=2
 inherit autotools eutils multilib libtool
@@ -26,10 +26,15 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 		!mail-mta/courier
 		userland_GNU? ( sys-process/procps )"
-RDEPEND="${RDEPEND}
-		!virtual/imapd"
 
-PROVIDE="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/cyrus-imapd
+	!net-mail/uw-imap"
 
 RC_VER="4.0.6-r1"
 INITD_VER="4.0.6-r1"