diff options
| -rw-r--r-- | eclass/confutils.eclass | 4 | ||||
| -rw-r--r-- | eclass/php-sapi.eclass | 4 | ||||
| -rw-r--r-- | eclass/php5-sapi.eclass | 18 |
3 files changed, 14 insertions, 12 deletions
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass index 4693454398b5..f1736cdcc337 100644 --- a/eclass/confutils.eclass +++ b/eclass/confutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.5 2004/07/21 16:25:34 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.6 2004/08/03 02:51:20 robbat2 Exp $ # # eclass/confutils.eclass # Utility functions to help with configuring a package @@ -19,7 +19,7 @@ IUSE="$IUSE shared" # list of USE flags that need deps that aren't yet in Portage # this list was originally added for PHP -CONFUTILS_MISSING_DEPS="adabas birdstep cpdflib qdbm db2 dbmaker empress empress-bcs esoob filepro frontbase hyperwave-api informix ingres interbase mcve mnogosearch msession msql oci8 oracle7 ovirmos pfpro sapdb solid sybase sybase-ct" +CONFUTILS_MISSING_DEPS="adabas birdstep cpdflib db2 dbmaker empress empress-bcs esoob filepro frontbase hyperwave-api informix ingres interbase mcve mnogosearch msession msql oci8 oracle7 ovrimos pfpro qdbm sapdb solid sybase sybase-ct" # ======================================================================== # confutils_init () diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 6a22c401c673..059abf35b0e1 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.45 2004/07/29 06:29:15 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.46 2004/08/03 02:51:20 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -527,7 +527,7 @@ php-sapi_src_install() { mv ${D}/usr/bin/php-config ${D}/usr/bin/php-config.${PN} # these files are provided solely by the PHP provider ebuild php-sapi_is_providerbuild && dosym /usr/bin/php-config.${PN} /usr/bin/php-config - php-sapi_is_providerbuild || rm -rf ${D}/usr/bin/{phpize,phpextdist} ${D}/usr/lib/php/build + php-sapi_is_providerbuild || rm -rf ${D}/usr/bin/{phpize,phpextdist} ${D}/usr/lib/php/build ${D}/usr/bin/php # get the extension dir PHPEXTDIR="`${D}/usr/bin/php-config.${PN} --extension-dir`" diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass index 89530fa08e65..d131a21bc896 100644 --- a/eclass/php5-sapi.eclass +++ b/eclass/php5-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.10 2004/07/28 07:40:32 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.11 2004/08/03 02:51:20 robbat2 Exp $ # # eclass/php5-sapi.eclass # Eclass for building different php5 SAPI instances @@ -23,10 +23,9 @@ HOMEPAGE="http://www.php.net/" LICENSE="PHP" SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbmaker dbx dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session shared sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc zlib" +IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session shared sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib" # these USE flags should have the correct dependencies - DEPEND="$DEPEND !<=dev-php/php-4.99.99 berkdb? ( =sys-libs/db-4* ) @@ -66,11 +65,14 @@ DEPEND="$DEPEND tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype >=media-libs/t1lib-5.0.0 ) wddx? ( dev-libs/expat ) - xml2? ( dev-libs/libxml2 ) xpm? ( virtual/x11 ) xsl? ( dev-libs/libxslt ) zlib? ( sys-libs/zlib )" +# this would be xml2? +DEPEND="$DEPEND + dev-libs/libxml2" + # ======================================================================== PHP_BUILDTARGETS="${PHP_BUILDTARGETS} build-modules" @@ -143,7 +145,7 @@ php5-sapi_check_awkward_uses () { fi if useq dbx ; then - confutils_use_depend_any "dbx" "frontbase" "mssql" "odbc" "postgresql" "sybase-ct" "oci8" "sqlite" + confutils_use_depend_any "dbx" "frontbase" "mssql" "odbc" "postgres" "sybase-ct" "oci8" "sqlite" enable_extension_enable "dbx" "dbx" 1 fi @@ -159,7 +161,7 @@ php5-sapi_check_awkward_uses () { enable_extension_with "jpeg-dir" "jpeg" 0 "/usr" enable_extension_with "png-dir" "png" 0 "/usr" enable_extension_with "tiff-dir" "tiff" 0 "/usr" - enable_extension_with "xpm-dir" "x11" 0 "/usr/X11R6/lib" + enable_extension_with "xpm-dir" "xpm" 0 "/usr/X11R6/lib" # enable gd last, so configure can pick up the previous settings enable_extension_with "gd" "gd" 0 fi @@ -215,7 +217,7 @@ php5-sapi_check_awkward_uses () { fi confutils_use_depend_all "cdb" "dba" - confutils_use_depend_all "db4" "dba" + confutils_use_depend_all "berkdb" "dba" confutils_use_depend_all "flatfile" "dba" confutils_use_depend_all "gdbm" "dba" confutils_use_depend_all "inifile" "dba" @@ -362,7 +364,7 @@ php5-sapi_src_compile () { enable_extension_disable "tokenizer" "tokenizer" 1 enable_extension_enable "wddx" "wddx" 1 enable_extension_with "xsl" "xsl" 1 - enable_extension_disable "xml" "xml2" 1 + #enable_extension_disable "xml" "xml2" 1 # PEAR needs --enable-xml enable_extension_with "xmlrpc" "xmlrpc" 1 enable_extension_enable "yp" "nis" 1 enable_extension_with "zlib" "zlib" 1 |