Remove pear USE flag to fix weird dependency issues.

3 files changed, 6 insertions, 18 deletions

diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 96f4d4d2f71a..1f65ac9ce933 100644
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.10 2006/01/17 22:40:18 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.11 2006/01/23 18:46:49 chtekk Exp $
 #
 # ########################################################################
 #
@@ -39,7 +39,7 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl db2 dba dbase dbmaker dbx debug doc empress empress-bcs esoob exif expat fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-internal java-external kerberos ldap libedit mcal mcve memlimit mhash ming mnogosearch msql mssql mysql ncurses nls oci8 oci8-instant-client odbc oracle7 overload ovrimos pcntl pcre pear pfpro pic posix postgres readline recode sapdb session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc threads tiff tokenizer truetype wddx xml xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl db2 dba dbase dbmaker dbx debug doc empress empress-bcs esoob exif expat fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-internal java-external kerberos ldap libedit mcal mcve memlimit mhash ming mnogosearch msql mssql mysql ncurses nls oci8 oci8-instant-client odbc oracle7 overload ovrimos pcntl pcre pfpro pic posix postgres readline recode sapdb session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc threads tiff tokenizer truetype wddx xml xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
@@ -112,7 +112,6 @@ RDEPEND="${RDEPEND} ${DEPEND}"
 PDEPEND="${PDEPEND}
 		doc? ( app-doc/php-docs )
 		java-external? ( dev-php4/php-java-bridge )
-		pear? ( >=dev-php/PEAR-PEAR-1.3.6 )
 		sqlite? ( dev-php4/pecl-sqlite )
 		yaz? ( dev-php4/pecl-yaz )
 		zip? ( dev-php4/pecl-zip )"
@@ -208,9 +207,6 @@ php4_4-sapi_check_awkward_uses() {
 	confutils_use_depend_all "sapdb"		"odbc"
 	confutils_use_depend_all "solid"		"odbc"
 
-	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "expat" "zlib"
-
 	# Readline and libedit do the same thing; you can't have both
 	confutils_use_conflict "readline" "libedit"
 
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index f65eaa1757ef..f46822d28adb 100644
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.12 2006/01/17 22:41:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.13 2006/01/23 18:46:49 chtekk Exp $
 #
 # ########################################################################
 #
@@ -39,7 +39,7 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming mnogosearch msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo-external pear pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xml xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming mnogosearch msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo-external pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xml xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
@@ -115,7 +115,6 @@ PDEPEND="${PDEPEND}
 		java-external? ( dev-php5/php-java-bridge )
 		mcve? ( dev-php5/pecl-mcve )
 		pdo-external? ( dev-php5/pecl-pdo )
-		pear? ( >=dev-php/PEAR-PEAR-1.3.6 )
 		yaz? ( dev-php5/pecl-yaz )
 		zip? ( dev-php5/pecl-zip )"
 
@@ -210,9 +209,6 @@ php5_0-sapi_check_awkward_uses() {
 	confutils_use_depend_all "sapdb"		"odbc"
 	confutils_use_depend_all "solid"		"odbc"
 
-	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "xml" "zlib"
-
 	# QDBM doesn't play nicely with GDBM
 	confutils_use_conflict "qdbm" "gdbm"
 
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index 0bb69c2c70f3..b525cd651811 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.13 2006/01/17 22:45:09 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.14 2006/01/23 18:46:49 chtekk Exp $
 #
 # ########################################################################
 #
@@ -39,7 +39,7 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pear pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tokenizer truetype vm-goto vm-switch wddx xml xmlreader xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tokenizer truetype vm-goto vm-switch wddx xml xmlreader xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
@@ -115,7 +115,6 @@ PDEPEND="${PDEPEND}
 		java-external? ( dev-php5/php-java-bridge )
 		mcve? ( dev-php5/pecl-mcve )
 		pdo-external? ( dev-php5/pecl-pdo )
-		pear? ( >=dev-php/PEAR-PEAR-1.3.6 )
 		yaz? ( dev-php5/pecl-yaz )
 		zip? ( dev-php5/pecl-zip )"
 
@@ -214,9 +213,6 @@ php5_1-sapi_check_awkward_uses() {
 	# packages (dev-php5/pecl-pdo), but not both
 	confutils_use_conflict "pdo" "pdo-external"
 
-	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "xml" "zlib"
-
 	# QDBM doesn't play nicely with GDBM
 	confutils_use_conflict "qdbm" "gdbm"