Fix modular-x deps on old PHP eclasses. Not really needed, but makes tracing of real modular-x bugs easier.

7 files changed, 14 insertions, 14 deletions

diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass
index d3629ac09448..d458ecb201a8 100644
--- a/eclass/php-2.eclass
+++ b/eclass/php-2.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-2.eclass,v 1.20 2006/01/22 18:52:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.21 2006/01/26 06:06:40 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 # This eclass is the old style of php, that was used before php-core was
@@ -52,7 +52,7 @@ RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.*
 RDEPEND="
    >=sys-libs/cracklib-2.7-r7
    app-arch/bzip2
-   X? ( virtual/x11 )
+   X? ( || ( x11-libs/libXpm virtual/x11 ) )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
    curl? ( >=net-misc/curl-7.10.2 )
    x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 697fc88fa789..33d0fb76bf36 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-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/php-sapi.eclass,v 1.88 2006/01/07 18:24:29 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.89 2006/01/26 06:06:40 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -75,7 +75,7 @@ RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1*
 RDEPEND="${RDEPEND}
 	!dev-lang/php
 	app-arch/bzip2
-	X? ( virtual/x11 )
+	X? ( || ( x11-libs/libXpm virtual/x11 ) )
 	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
 	curl? ( >=net-misc/curl-7.10.2 )
 	x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
diff --git a/eclass/php.eclass b/eclass/php.eclass
index 344d23669008..428f5652dd09 100644
--- a/eclass/php.eclass
+++ b/eclass/php.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.eclass,v 1.104 2005/09/25 12:30:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.105 2006/01/26 06:06:40 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 # This eclass is the old style of php, that was used before php-core was
@@ -53,7 +53,7 @@ RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.*
 RDEPEND="
    >=sys-libs/cracklib-2.7-r7
    app-arch/bzip2
-   X? ( virtual/x11 )
+   X? ( || ( x11-libs/libXpm virtual/x11 ) )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
    curl? ( >=net-misc/curl-7.10.2 )
    x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 1487f120ffe9..65559db1e32b 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.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-sapi-r1.eclass,v 1.21 2006/01/22 18:52:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.22 2006/01/26 06:06:40 robbat2 Exp $
 #
 # eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
@@ -68,7 +68,7 @@ DEPEND="$DEPEND
 	tiff? ( media-libs/tiff )
 	truetype? ( =media-libs/freetype-1* =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
-	xpm? ( virtual/x11 )
+	xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib )"
 
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 17d45e998a39..b945063ab079 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.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-sapi-r2.eclass,v 1.38 2006/01/22 18:52:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.39 2006/01/26 06:06:40 robbat2 Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -85,7 +85,7 @@ DEPEND="$DEPEND
 	tiff? ( media-libs/tiff )
 	truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
-	xpm? ( virtual/x11 )
+	xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index fa4a7985a123..9e063496c334 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.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-sapi-r3.eclass,v 1.22 2005/08/23 14:55:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.23 2006/01/26 06:06:40 robbat2 Exp $
 #
 # ########################################################################
 #
@@ -86,7 +86,7 @@ DEPEND="$DEPEND
 	tiff? ( media-libs/tiff )
 	truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
-	xpm? ( virtual/x11 )
+	xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index c3f47816afd6..0c206ba92312 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.55 2006/01/22 18:52:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.56 2006/01/26 06:06:40 robbat2 Exp $
 #
 # eclass/php5-sapi.eclass
 #		Eclass for building different php5 SAPI instances
@@ -68,7 +68,7 @@ DEPEND="$DEPEND
 	tiff? ( media-libs/tiff )
 	truetype? ( =media-libs/freetype-1* =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
-	xpm? ( virtual/x11 )
+	xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "