diff options
| -rw-r--r-- | eclass/confutils.eclass | 4 | ||||
| -rw-r--r-- | eclass/php5-sapi.eclass | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass index f1736cdcc337..0b810140e46c 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.6 2004/08/03 02:51:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.7 2004/08/06 02:59:47 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 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_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 sapdb solid sybase sybase-ct" # ======================================================================== # confutils_init () diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass index cb3c9f5196df..9c266391bccd 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.12 2004/08/06 00:56:28 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.13 2004/08/06 02:59:47 robbat2 Exp $ # # eclass/php5-sapi.eclass # Eclass for building different php5 SAPI instances @@ -51,6 +51,7 @@ DEPEND="$DEPEND odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( >=dev-db/postgresql-7.1 ) png? ( media-libs/libpng ) + qdbm ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) @@ -199,8 +200,11 @@ php5-sapi_check_awkward_uses () { enable_extension_with "mysqli" "mysqli" 1 fi + # QDBM doesn't play nicely with GDBM _or_ DBM + confutils_use_conflict "qdbm" "gdbm" "dbm" + # both provide the same functionality confutils_use_conflict "readline" "libedit" - + # Recode is not liked. confutils_use_conflict "recode" "mysql" "nis" if ! useq session ; then |