diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-01-23 18:46:49 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-01-23 18:46:49 +0000 |
| commit | 8076828c626a54225c308519d0dc71302fcbaf83 (patch) | |
| tree | 3f3917c11c7dc9862887834281aa36c338aa7c95 /eclass/php5_1-sapi.eclass | |
| parent | Marked stable on x86 (diff) | |
| download | gentoo-2-8076828c626a54225c308519d0dc71302fcbaf83.tar.gz gentoo-2-8076828c626a54225c308519d0dc71302fcbaf83.tar.bz2 gentoo-2-8076828c626a54225c308519d0dc71302fcbaf83.zip | |
Remove pear USE flag to fix weird dependency issues.
Diffstat (limited to 'eclass/php5_1-sapi.eclass')
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 8 |
1 files changed, 2 insertions, 6 deletions
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" |