Remove more virtual/x11 usages, nxserver is not marked as DEPRECATED in the header yet but unused. Leaving it for now

11 files changed, 22 insertions, 22 deletions

diff --git a/eclass/gtk-engines.eclass b/eclass/gtk-engines.eclass
index 3fe4f6df3641..609c685a6944 100644
--- a/eclass/gtk-engines.eclass
+++ b/eclass/gtk-engines.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/gtk-engines.eclass,v 1.35 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.36 2007/03/26 20:19:22 genstef Exp $
 
 # IMPORTANT:
 # This eclass is deprecated and should not be used in new ebuilds.
@@ -33,7 +33,7 @@ inherit eutils
 
 KEYWORDS="x86 ppc alpha sparc hppa amd64"
 
-DEPEND="virtual/x11"
+DEPEND=""
 
 case "${SLOT}" in
 	"1" )
diff --git a/eclass/mozilla.eclass b/eclass/mozilla.eclass
index 517bbdc50053..5ef11d48c493 100644
--- a/eclass/mozilla.eclass
+++ b/eclass/mozilla.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/mozilla.eclass,v 1.32 2007/02/27 17:02:37 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.33 2007/03/26 20:19:22 genstef Exp $
 #
 # You probably don't want to change this eclass.  Newer ebuilds use
 # mozconfig.eclass instead.
@@ -14,7 +14,7 @@ IUSE="${IUSE} moznoxft"
 [[ ${PN} == mozilla ]] && \
 	IUSE="${IUSE} mozsvg"
 
-RDEPEND="virtual/x11
+RDEPEND="
 	!moznoxft? ( virtual/xft )
 	>=media-libs/fontconfig-2.1
 	>=sys-libs/zlib-1.1.4
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 6a1ddea0f13c..cc2e062074d3 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.91 2006/11/23 14:02:50 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.92 2007/03/26 20:19:22 genstef 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? ( || ( x11-libs/libXpm virtual/x11 ) )
+	X? ( x11-libs/libXpm )
 	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/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 7cc4da0971f0..e2714c1dada0 100644
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.33 2007/03/06 12:46:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.34 2007/03/26 20:19:22 genstef Exp $
 
 # ========================================================================
 #
@@ -94,7 +94,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
 		truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( !gd-external? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) )
 		xml? ( dev-libs/libxml2 sys-libs/zlib xsl? ( dev-libs/libxslt ) )
 		xmlrpc? ( dev-libs/expat virtual/libiconv )
-		xpm? ( || ( x11-libs/libXpm virtual/x11 ) >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+		xpm? ( x11-libs/libXpm >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
 		xsl? ( app-text/sablotron dev-libs/expat virtual/libiconv )
 		zlib? ( sys-libs/zlib )
 		virtual/mta"
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 290d7081a3c2..03be7802b2c8 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.23 2006/11/23 14:02:50 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.24 2007/03/26 20:19:22 genstef 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? ( || ( x11-libs/libXpm virtual/x11 ) )
+	xpm? ( x11-libs/libXpm )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib )"
 
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 45ce83193189..b3e22072b23c 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.42 2006/11/23 14:02:50 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.43 2007/03/26 20:19:22 genstef 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? ( || ( x11-libs/libXpm virtual/x11 ) )
+	xpm? ( x11-libs/libXpm )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index 417416d7c413..4c7fa074aaed 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.24 2006/11/23 14:02:50 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.25 2007/03/26 20:19:22 genstef 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? ( || ( x11-libs/libXpm virtual/x11 ) )
+	xpm? ( x11-libs/libXpm )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index 0752763b5cc7..1c5bcb402573 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.57 2006/11/23 14:02:50 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.58 2007/03/26 20:19:22 genstef 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? ( || ( x11-libs/libXpm virtual/x11 ) )
+	xpm? ( x11-libs/libXpm )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index 03517ad657bd..f7499af7b4c2 100644
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.32 2007/03/06 12:46:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.33 2007/03/26 20:19:22 genstef Exp $
 
 # ========================================================================
 #
@@ -100,7 +100,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
 		wddx? ( >=dev-libs/libxml2-2.6.8 )
 		xml? ( >=dev-libs/libxml2-2.6.8 )
 		xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-		xpm? ( || ( x11-libs/libXpm virtual/x11 ) >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+		xpm? ( x11-libs/libXpm >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
 		xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 		zlib? ( sys-libs/zlib )
 		virtual/mta"
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index 55c4f198538d..039b7f74a2e4 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.39 2007/03/06 12:46:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.40 2007/03/26 20:19:22 genstef Exp $
 
 # ========================================================================
 #
@@ -102,7 +102,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
 		xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 		xmlreader? ( >=dev-libs/libxml2-2.6.8 )
 		xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-		xpm? ( || ( x11-libs/libXpm virtual/x11 ) >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+		xpm? ( x11-libs/libXpm >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
 		xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 		zlib? ( sys-libs/zlib )
 		virtual/mta"
diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass
index 603cc38c3ea2..311772c45bde 100644
--- a/eclass/php5_2-sapi.eclass
+++ b/eclass/php5_2-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.2 2007/03/06 12:46:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.3 2007/03/26 20:19:22 genstef Exp $
 
 # ========================================================================
 #
@@ -101,7 +101,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
 		xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 		xmlreader? ( >=dev-libs/libxml2-2.6.8 )
 		xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-		xpm? ( || ( x11-libs/libXpm virtual/x11 ) >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+		xpm? ( x11-libs/libXpm >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
 		xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 		zip? ( sys-libs/zlib )
 		zlib? ( sys-libs/zlib )