Removed use of php_check_imap. #359221

(Portage version: 2.1.9.25/cvs/Linux i686)

8 files changed, 21 insertions, 25 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index f40acceb3ad9..5f7cca7b3186 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.476 2011/03/17 10:14:58 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.477 2011/03/17 16:34:47 olemarkus Exp $
+
+  17 Mar 2011; Ole Markus With <olemarkus@gentoo.org>
+  files/eblits/pkg_setup-v1.eblit, php-5.2.17.ebuild, php-5.3.3-r1.ebuild,
+  php-5.3.5.ebuild, php-5.3.5-r1.ebuild, files/eblits/pkg_setup-v2.eblit,
+  php-5.3.6_rc3.ebuild:
+  Removed use of php_check_imap. #359221
 
   17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.2.14.ebuild,
   -php-5.2.16.ebuild, -php-5.3.4.ebuild:
diff --git a/dev-lang/php/files/eblits/pkg_setup-v1.eblit b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
index f487a0b309e3..8134d4b4c64a 100644
--- a/dev-lang/php/files/eblits/pkg_setup-v1.eblit
+++ b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
@@ -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/dev-lang/php/files/eblits/pkg_setup-v1.eblit,v 1.2 2010/07/08 22:39:52 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v1.eblit,v 1.3 2011/03/17 16:34:47 olemarkus Exp $
 
 eblit-php-pkg_setup() {
 	if use concurrentmodphp || use kolab ; then
@@ -13,11 +13,6 @@ eblit-php-pkg_setup() {
 	# Mail support
 	php_check_mta
 
-	# imap support
-	# if virtuals/imap-c-client goes to new style virtual, we  can exchange this
-	# for proper use-deps
-	php_check_imap
-
 	# Oracle support
 	php_check_oracle_8
 
diff --git a/dev-lang/php/files/eblits/pkg_setup-v2.eblit b/dev-lang/php/files/eblits/pkg_setup-v2.eblit
index 4c12887572c7..a5218b369bf0 100644
--- a/dev-lang/php/files/eblits/pkg_setup-v2.eblit
+++ b/dev-lang/php/files/eblits/pkg_setup-v2.eblit
@@ -1,16 +1,11 @@
-# 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/dev-lang/php/files/eblits/pkg_setup-v2.eblit,v 1.1 2010/10/08 18:25:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v2.eblit,v 1.2 2011/03/17 16:34:47 olemarkus Exp $
 
 eblit-php-pkg_setup() {
 	# Mail support
 	php_check_mta
 
-	# imap support
-	# if virtuals/imap-c-client goes to new style virtual, we  can exchange this
-	# for proper use-deps
-	php_check_imap
-
 	# Oracle support
 	php_check_oracle_8
 
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 40e521cb4f9f..c2c036b710a1 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.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/dev-lang/php/php-5.2.17.ebuild,v 1.11 2011/03/15 19:09:16 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.12 2011/03/17 16:34:47 olemarkus Exp $
 
 EAPI=2
 
@@ -133,7 +133,7 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
+	imap? ( virtual/imap-c-client[ssl=] )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
 	kolab? ( >=net-libs/c-client-2004g-r1 )
diff --git a/dev-lang/php/php-5.3.3-r1.ebuild b/dev-lang/php/php-5.3.3-r1.ebuild
index 065a23889a5a..f210789393d1 100644
--- a/dev-lang/php/php-5.3.3-r1.ebuild
+++ b/dev-lang/php/php-5.3.3-r1.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/dev-lang/php/php-5.3.3-r1.ebuild,v 1.11 2011/03/14 22:31:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r1.ebuild,v 1.12 2011/03/17 16:34:47 olemarkus Exp $
 
 EAPI=2
 
@@ -137,7 +137,7 @@ DEPEND="app-admin/php-toolkit
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
+	imap? ( virtual/imap-c-client[ssl=] )
 	intl? ( dev-libs/icu )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
diff --git a/dev-lang/php/php-5.3.5-r1.ebuild b/dev-lang/php/php-5.3.5-r1.ebuild
index fa85d92c63c6..8e96f40fa932 100644
--- a/dev-lang/php/php-5.3.5-r1.ebuild
+++ b/dev-lang/php/php-5.3.5-r1.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/dev-lang/php/php-5.3.5-r1.ebuild,v 1.3 2011/03/14 22:31:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5-r1.ebuild,v 1.4 2011/03/17 16:34:47 olemarkus Exp $
 
 EAPI=2
 
@@ -143,7 +143,7 @@ DEPEND="!dev-lang/php:5
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
+	imap? ( virtual/imap-c-client[ssl=] )
 	intl? ( dev-libs/icu )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
diff --git a/dev-lang/php/php-5.3.5.ebuild b/dev-lang/php/php-5.3.5.ebuild
index c7e7f4f6fc5b..7201cf6f91e5 100644
--- a/dev-lang/php/php-5.3.5.ebuild
+++ b/dev-lang/php/php-5.3.5.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/dev-lang/php/php-5.3.5.ebuild,v 1.12 2011/03/14 22:31:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5.ebuild,v 1.13 2011/03/17 16:34:47 olemarkus Exp $
 
 EAPI=2
 
@@ -142,7 +142,7 @@ DEPEND="!dev-lang/php:5
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
+	imap? ( virtual/imap-c-client[ssl=] )
 	intl? ( dev-libs/icu )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
diff --git a/dev-lang/php/php-5.3.6_rc3.ebuild b/dev-lang/php/php-5.3.6_rc3.ebuild
index 8ce2684ad5fa..6383e24eddf2 100644
--- a/dev-lang/php/php-5.3.6_rc3.ebuild
+++ b/dev-lang/php/php-5.3.6_rc3.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/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.4 2011/03/16 16:50:42 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.5 2011/03/17 16:34:47 olemarkus Exp $
 
 EAPI=2
 
@@ -142,7 +142,7 @@ DEPEND="!dev-lang/php:5
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client )
+	imap? ( virtual/imap-c-client[ssl=] )
 	intl? ( dev-libs/icu )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )