1 |
hoffie 09/06/21 23:09:02 |
2 |
|
3 |
Modified: php5_2-sapi.eclass |
4 |
Log: |
5 |
removing traces of USE=zip-external for dev-lang/php |
6 |
|
7 |
Revision Changes Path |
8 |
1.24 eclass/php5_2-sapi.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.24&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.24&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.23&r2=1.24 |
13 |
|
14 |
Index: php5_2-sapi.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v |
17 |
retrieving revision 1.23 |
18 |
retrieving revision 1.24 |
19 |
diff -u -r1.23 -r1.24 |
20 |
--- php5_2-sapi.eclass 7 Jul 2008 01:51:08 -0000 1.23 |
21 |
+++ php5_2-sapi.eclass 21 Jun 2009 23:09:02 -0000 1.24 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.23 2008/07/07 01:51:08 jer Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.24 2009/06/21 23:09:02 hoffie Exp $ |
27 |
|
28 |
# ======================================================================== |
29 |
# Based on robbat2's work on the php4 sapi eclass |
30 |
@@ -43,7 +43,7 @@ |
31 |
S="${WORKDIR}/${MY_PHP_P}" |
32 |
fi |
33 |
|
34 |
-IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zip-external zlib" |
35 |
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib" |
36 |
|
37 |
# these USE flags should have the correct dependencies |
38 |
DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 ) |
39 |
@@ -133,9 +133,7 @@ |
40 |
mcve? ( dev-php5/pecl-mcve ) |
41 |
pdo? ( !dev-php5/pecl-pdo ) |
42 |
suhosin? ( dev-php5/suhosin ) |
43 |
- yaz? ( dev-php5/pecl-yaz ) |
44 |
- zip? ( !dev-php5/pecl-zip ) |
45 |
- zip-external? ( dev-php5/pecl-zip )" |
46 |
+ yaz? ( dev-php5/pecl-yaz )" |
47 |
|
48 |
# ======================================================================== |
49 |
# php.ini Support |
50 |
@@ -204,7 +202,6 @@ |
51 |
phpconfutils_use_conflict "gd" "gd-external" |
52 |
phpconfutils_use_conflict "oci8" "oci8-instant-client" |
53 |
phpconfutils_use_conflict "oci8" "ldap-sasl" |
54 |
- phpconfutils_use_conflict "zip" "zip-external" |
55 |
phpconfutils_use_conflict "qdbm" "gdbm" |
56 |
phpconfutils_use_conflict "readline" "libedit" |
57 |
phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" "kolab" |