summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/php5_0-sapi.eclass11
-rw-r--r--eclass/php5_1-sapi.eclass12
2 files changed, 19 insertions, 4 deletions
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index db691fe35281..6491c519c58b 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.9 2006/01/04 11:44:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.10 2006/01/04 18:00:27 chtekk Exp $
#
# ########################################################################
#
@@ -92,10 +92,11 @@ DEPEND="${DEPEND}
tidy? ( app-text/htmltidy )
tiff? ( media-libs/tiff )
truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
xml? ( >=dev-libs/libxml2-2.6.8 )
xmlrpc? ( >=dev-libs/libxml2-2.6.8 )
xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
- xsl? ( dev-libs/libxslt )
+ xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
zlib? ( sys-libs/zlib )
virtual/mta"
@@ -172,6 +173,12 @@ php5_0-sapi_check_awkward_uses() {
confutils_use_depend_all "xpm" "gd"
confutils_use_depend_all "gd" "zlib"
+ # XML related extensions
+ confutils_use_depend_all "soap" "xml"
+ confutils_use_depend_all "simplexml" "xml"
+ confutils_use_depend_all "xsl" "xml"
+ confutils_use_depend_all "wddx" "xml"
+
# IMAP support
php_check_imap
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index f6b0334397bc..5ba08e3fa31a 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.9 2006/01/04 11:44:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.10 2006/01/04 18:00:27 chtekk Exp $
#
# ########################################################################
#
@@ -91,11 +91,12 @@ DEPEND="${DEPEND}
sybase? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
xml? ( >=dev-libs/libxml2-2.6.8 )
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
xmlrpc? ( >=dev-libs/libxml2-2.6.8 )
xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
- xsl? ( dev-libs/libxslt )
+ xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
zlib? ( sys-libs/zlib )
virtual/mta"
@@ -171,6 +172,13 @@ php5_1-sapi_check_awkward_uses() {
confutils_use_depend_all "xpm" "gd"
confutils_use_depend_all "gd" "zlib"
+ # XML related extensions
+ confutils_use_depend_all "soap" "xml"
+ confutils_use_depend_all "simplexml" "xml"
+ confutils_use_depend_all "xsl" "xml"
+ confutils_use_depend_all "wddx" "xml"
+ confutils_use_depend_all "xmlreader" "xml"
+
# IMAP support
php_check_imap