Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

17 files changed, 113 insertions, 41 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 1ee42aa9d840..75217f2f70a4 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.624 2007/06/24 18:14:41 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.625 2007/07/22 06:35:08 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gcc-3.3.6.ebuild,
+  gcc-3.3.6-r1.ebuild, gcc-3.4.4-r1.ebuild, gcc-3.4.5.ebuild,
+  gcc-3.4.5-r1.ebuild, gcc-3.4.6.ebuild, gcc-3.4.6-r1.ebuild,
+  gcc-3.4.6-r2.ebuild, gcc-4.0.3.ebuild, gcc-4.0.4.ebuild,
+  gcc-4.1.0-r1.ebuild, gcc-4.1.1.ebuild, gcc-4.1.1-r1.ebuild,
+  gcc-4.1.1-r3.ebuild, gcc-4.1.2.ebuild, gcc-4.2.0.ebuild:
+  Drop virtual/x11 references.
 
   24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> gcc-3.2.2.ebuild:
   (QA) Don't use KEYWORDS="-*". bug #160519.
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index d9a8b64cb7f8..5d3e3c8494bd 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -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/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.7 2007/01/12 15:35:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.8 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.4"
@@ -49,7 +49,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.3.6.ebuild b/sys-devel/gcc/gcc-3.3.6.ebuild
index d77d2d07c6e4..34a28969d3d2 100644
--- a/sys-devel/gcc/gcc-3.3.6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.25 2006/08/14 16:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.26 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.3"
@@ -49,7 +49,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.4-r1.ebuild b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
index 23d116a08962..f3d90125e3b9 100644
--- a/sys-devel/gcc/gcc-3.4.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.17 2006/08/14 16:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.18 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.7"
@@ -55,7 +55,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.5-r1.ebuild b/sys-devel/gcc/gcc-3.4.5-r1.ebuild
index 9fb8e0c7e55f..1b6620df5dd2 100644
--- a/sys-devel/gcc/gcc-3.4.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5-r1.ebuild,v 1.15 2006/08/14 16:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5-r1.ebuild,v 1.16 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.4"
@@ -52,7 +52,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.5.ebuild b/sys-devel/gcc/gcc-3.4.5.ebuild
index a5c3804f8992..e2915cf346f5 100644
--- a/sys-devel/gcc/gcc-3.4.5.ebuild
+++ b/sys-devel/gcc/gcc-3.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5.ebuild,v 1.18 2006/08/14 16:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5.ebuild,v 1.19 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.2"
@@ -52,7 +52,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.6-r1.ebuild b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
index a17c2f61879d..0165f58222f6 100644
--- a/sys-devel/gcc/gcc-3.4.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r1.ebuild,v 1.15 2006/09/09 02:48:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r1.ebuild,v 1.16 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.2"
@@ -56,7 +56,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index b8e55dd21636..30eda9643747 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -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/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.17 2007/05/19 03:49:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.18 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.5"
@@ -57,7 +57,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-3.4.6.ebuild b/sys-devel/gcc/gcc-3.4.6.ebuild
index c5ca14aef97c..c01695fadd5d 100644
--- a/sys-devel/gcc/gcc-3.4.6.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6.ebuild,v 1.12 2006/08/14 16:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6.ebuild,v 1.13 2007/07/22 06:35:08 dberkholz Exp $
 
 MAN_VER=""
 PATCH_VER="1.0"
@@ -55,7 +55,11 @@ RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 			)
 			>=media-libs/libart_lgpl-2.1
diff --git a/sys-devel/gcc/gcc-4.0.3.ebuild b/sys-devel/gcc/gcc-4.0.3.ebuild
index c748d085cc19..a7924921f020 100644
--- a/sys-devel/gcc/gcc-4.0.3.ebuild
+++ b/sys-devel/gcc/gcc-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.3.ebuild,v 1.12 2006/12/26 21:37:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.3.ebuild,v 1.13 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -33,7 +33,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 9d6f0556eb33..a25be9c86f93 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -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/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.1 2007/02/05 00:46:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.2 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -33,7 +33,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.1.0-r1.ebuild b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
index cd504bb31417..d7ebc5697970 100644
--- a/sys-devel/gcc/gcc-4.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
@@ -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/sys-devel/gcc/gcc-4.1.0-r1.ebuild,v 1.14 2007/04/04 03:55:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0-r1.ebuild,v 1.15 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.1"
@@ -28,7 +28,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.1.1-r1.ebuild b/sys-devel/gcc/gcc-4.1.1-r1.ebuild
index a79b8ac09d40..7eb31472d064 100644
--- a/sys-devel/gcc/gcc-4.1.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1-r1.ebuild
@@ -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/sys-devel/gcc/gcc-4.1.1-r1.ebuild,v 1.17 2007/01/08 04:47:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r1.ebuild,v 1.18 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.7.1"
 UCLIBC_VER="1.1"
@@ -28,7 +28,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.1.1-r3.ebuild b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
index 357459730336..ec3bb285abdf 100644
--- a/sys-devel/gcc/gcc-4.1.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
@@ -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/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.14 2007/05/12 19:36:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.15 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.10"
 UCLIBC_VER="1.1"
@@ -28,7 +28,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.1.1.ebuild b/sys-devel/gcc/gcc-4.1.1.ebuild
index 95e6c131a42f..2f4747aea18a 100644
--- a/sys-devel/gcc/gcc-4.1.1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1.ebuild,v 1.23 2006/12/26 21:37:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1.ebuild,v 1.24 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.6"
 UCLIBC_VER="1.1"
@@ -28,7 +28,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 610062f1f9df..bf5693b9e642 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -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/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.12 2007/06/12 17:04:09 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.13 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.0.1"
 UCLIBC_VER="1.0"
@@ -29,7 +29,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)
diff --git a/sys-devel/gcc/gcc-4.2.0.ebuild b/sys-devel/gcc/gcc-4.2.0.ebuild
index e8f8aa62daaf..6b6c1eb39806 100644
--- a/sys-devel/gcc/gcc-4.2.0.ebuild
+++ b/sys-devel/gcc/gcc-4.2.0.ebuild
@@ -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/sys-devel/gcc/gcc-4.2.0.ebuild,v 1.5 2007/07/20 05:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.0.ebuild,v 1.6 2007/07/22 06:35:08 dberkholz Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -28,7 +28,11 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? (
 		gcj? (
 			gtk? (
-				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-libs/libXtst
+				x11-proto/xproto
+				x11-proto/xextproto
 				>=x11-libs/gtk+-2.2
 				x11-libs/pango
 			)