diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-01-04 11:44:55 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-01-04 11:44:55 +0000 |
| commit | 91455e17b72dbe101ffec4e862c2c69550460d38 (patch) | |
| tree | b80c83f134107eca8c205e382906b7f9910267c5 | |
| parent | Version bump. (diff) | |
| download | gentoo-2-91455e17b72dbe101ffec4e862c2c69550460d38.tar.gz gentoo-2-91455e17b72dbe101ffec4e862c2c69550460d38.tar.bz2 gentoo-2-91455e17b72dbe101ffec4e862c2c69550460d38.zip | |
Change X11 deps order, first new modular X then virtual.
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 4 | ||||
| -rw-r--r-- | eclass/php5_0-sapi.eclass | 4 | ||||
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index 4330843bc44a..1569150d1e37 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-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/php4_4-sapi.eclass,v 1.7 2006/01/04 09:22:48 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.8 2006/01/04 11:44:55 chtekk Exp $ # # ######################################################################## # @@ -89,7 +89,7 @@ DEPEND="${DEPEND} sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 ) - xpm? ( || ( virtual/x11 x11-libs/libXpm ) ) + xpm? ( || ( x11-libs/libXpm virtual/x11 ) ) xml? ( dev-libs/libxml2 xsl? ( dev-libs/libxslt ) ) xmlrpc? ( dev-libs/expat ) xsl? ( app-text/sablotron dev-libs/expat ) diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass index 89bc7343dea5..db691fe35281 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.8 2006/01/04 09:22:48 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.9 2006/01/04 11:44:55 chtekk Exp $ # # ######################################################################## # @@ -94,7 +94,7 @@ DEPEND="${DEPEND} truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( || ( virtual/x11 x11-libs/libXpm ) ) + xpm? ( || ( x11-libs/libXpm virtual/x11 ) ) xsl? ( dev-libs/libxslt ) zlib? ( sys-libs/zlib ) virtual/mta" diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index fd7722202198..f6b0334397bc 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.8 2006/01/04 09:22:48 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.9 2006/01/04 11:44:55 chtekk Exp $ # # ######################################################################## # @@ -94,7 +94,7 @@ DEPEND="${DEPEND} xml? ( >=dev-libs/libxml2-2.6.8 ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( || ( virtual/x11 x11-libs/libXpm ) ) + xpm? ( || ( x11-libs/libXpm virtual/x11 ) ) xsl? ( dev-libs/libxslt ) zlib? ( sys-libs/zlib ) virtual/mta" |