Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

33 files changed, 135 insertions, 114 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index dcd91e235302..f5f4d14409e9 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/ccp4
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.12 2007/07/02 03:02:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.13 2007/07/22 07:18:45 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ccp4-6.0.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild:
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
index c267a96041bb..ba8767c1b5fe 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.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/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.6 2007/07/02 03:02:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.7 2007/07/22 07:18:45 dberkholz Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -52,14 +52,9 @@ IUSE="X"
 # as do many scripts. app-office/sc can't rename its because that's the name
 # of the package.
 RDEPEND="X? (
-			|| (
-				(
-					x11-libs/libX11
-					x11-libs/libXt
-					x11-libs/libXaw
-				)
-				virtual/x11
-			)
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXaw
 		)
 		>=dev-lang/tcl-8.3
 		>=dev-lang/tk-8.3
@@ -74,14 +69,9 @@ RDEPEND="X? (
 		!app-office/sc"
 DEPEND="${RDEPEND}
 		X? (
-			|| (
-				(
-					x11-misc/imake
-					x11-proto/inputproto
-					x11-proto/xextproto
-				)
-				virtual/x11
-			)
+			x11-misc/imake
+			x11-proto/inputproto
+			x11-proto/xextproto
 		)"
 
 S="${WORKDIR}/${PN}-${PV}"
diff --git a/sci-chemistry/ghemical/ChangeLog b/sci-chemistry/ghemical/ChangeLog
index 481a5f864222..d49e68d50c61 100644
--- a/sci-chemistry/ghemical/ChangeLog
+++ b/sci-chemistry/ghemical/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/ghemical
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.23 2007/01/18 15:07:08 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.24 2007/07/22 07:28:37 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ghemical-2.01.ebuild:
+  Drop virtual/x11 references.
 
   18 Jan 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
   Bump to ghemical-2.10
diff --git a/sci-chemistry/ghemical/ghemical-2.01.ebuild b/sci-chemistry/ghemical/ghemical-2.01.ebuild
index a4817ef3ee41..63bdc08106ff 100644
--- a/sci-chemistry/ghemical/ghemical-2.01.ebuild
+++ b/sci-chemistry/ghemical/ghemical-2.01.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/sci-chemistry/ghemical/ghemical-2.01.ebuild,v 1.4 2006/07/09 07:08:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-2.01.ebuild,v 1.5 2007/07/22 07:28:37 dberkholz Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RDEPEND="virtual/glut
 	>=sci-libs/libghemical-2
 	openbabel? ( >=sci-chemistry/openbabel-2 )
 	threads? ( >=dev-libs/glib-2.4 )
-	|| ( x11-libs/libXmu virtual/x11 )"
+	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15"
 
diff --git a/sci-chemistry/gopenmol/ChangeLog b/sci-chemistry/gopenmol/ChangeLog
index 3c2dcfc01c40..6f81c4c1bc7a 100644
--- a/sci-chemistry/gopenmol/ChangeLog
+++ b/sci-chemistry/gopenmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gopenmol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.7 2007/02/22 01:26:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.8 2007/07/22 07:22:46 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gopenmol-3.00-r1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
index 47a66fabbfae..9cb08804bd86 100644
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
+++ b/sci-chemistry/gopenmol/gopenmol-3.00-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/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild,v 1.1 2006/02/21 16:58:18 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild,v 1.2 2007/07/22 07:22:46 dberkholz Exp $
 
 inherit eutils
 
@@ -19,16 +19,12 @@ RDEPEND="=dev-lang/tcl-8.4*
 	virtual/glut
 	media-libs/jpeg
 	dev-lang/python
-	|| ( (
-			x11-libs/libXmu
-			x11-libs/libICE
-			x11-libs/libXau
-			x11-libs/libXdmcp
-			x11-libs/libXi
-			x11-libs/libXxf86vm
-		)
-		virtual/x11
-	)"
+	x11-libs/libXmu
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXxf86vm"
 
 DEPEND="${RDEPEND}"
 
diff --git a/sci-chemistry/maid/ChangeLog b/sci-chemistry/maid/ChangeLog
index 2a83af1fa8b7..84b656cd1534 100644
--- a/sci-chemistry/maid/ChangeLog
+++ b/sci-chemistry/maid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/maid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/maid/ChangeLog,v 1.11 2007/02/22 01:26:55 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/maid/ChangeLog,v 1.12 2007/07/22 07:22:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; maid-20011112.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-chemistry/maid/maid-20011112.ebuild b/sci-chemistry/maid/maid-20011112.ebuild
index 1e4bf46acaef..d450c6bf3c9e 100644
--- a/sci-chemistry/maid/maid-20011112.ebuild
+++ b/sci-chemistry/maid/maid-20011112.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/sci-chemistry/maid/maid-20011112.ebuild,v 1.6 2006/07/09 07:09:20 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/maid/maid-20011112.ebuild,v 1.7 2007/07/22 07:22:12 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,7 +18,7 @@ IUSE="X"
 DEPEND="X? ( virtual/motif
 		virtual/glu
 		virtual/opengl
-		|| ( x11-libs/libXt virtual/x11 )
+		x11-libs/libXt
 	)"
 S="${WORKDIR}/glmaid_dist"
 
diff --git a/sci-chemistry/molden/ChangeLog b/sci-chemistry/molden/ChangeLog
index 984198a3dfcd..5214b5ed70e7 100644
--- a/sci-chemistry/molden/ChangeLog
+++ b/sci-chemistry/molden/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molden
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.20 2007/06/23 01:37:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.21 2007/07/22 07:27:40 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; molden-4.3.ebuild,
+  molden-4.4.ebuild, molden-4.6.ebuild:
+  Drop virtual/x11 references.
 
 *molden-4.6 (23 Jun 2007)
 
diff --git a/sci-chemistry/molden/molden-4.3.ebuild b/sci-chemistry/molden/molden-4.3.ebuild
index b6b1161131ae..039154210346 100644
--- a/sci-chemistry/molden/molden-4.3.ebuild
+++ b/sci-chemistry/molden/molden-4.3.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/sci-chemistry/molden/molden-4.3.ebuild,v 1.11 2007/03/13 00:19:37 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.3.ebuild,v 1.12 2007/07/22 07:27:40 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,8 +15,8 @@ KEYWORDS="alpha amd64 ia64 x86"
 IUSE="opengl"
 
 RDEPEND="opengl? ( virtual/glut
-		virtual/opengl )
-	|| ( x11-libs/libXmu virtual/x11 )"
+	virtual/opengl )
+	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	virtual/libc"
 
diff --git a/sci-chemistry/molden/molden-4.4.ebuild b/sci-chemistry/molden/molden-4.4.ebuild
index cea172bd879e..e68a9a62c18e 100644
--- a/sci-chemistry/molden/molden-4.4.ebuild
+++ b/sci-chemistry/molden/molden-4.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/sci-chemistry/molden/molden-4.4.ebuild,v 1.2 2007/06/23 01:37:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.4.ebuild,v 1.3 2007/07/22 07:27:40 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic fortran
 
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 IUSE="opengl"
 
 RDEPEND="opengl? ( virtual/glut
-		virtual/opengl )
-	|| ( x11-libs/libXmu virtual/x11 )"
+	virtual/opengl )
+	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	virtual/libc"
 
diff --git a/sci-chemistry/molden/molden-4.6.ebuild b/sci-chemistry/molden/molden-4.6.ebuild
index 28d686e9640a..c740454e56f3 100644
--- a/sci-chemistry/molden/molden-4.6.ebuild
+++ b/sci-chemistry/molden/molden-4.6.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/sci-chemistry/molden/molden-4.6.ebuild,v 1.1 2007/06/23 01:37:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.6.ebuild,v 1.2 2007/07/22 07:27:40 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic fortran
 
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 IUSE="opengl"
 
 RDEPEND="opengl? ( virtual/glut
-		virtual/opengl )
-	|| ( x11-libs/libXmu virtual/x11 )"
+	virtual/opengl )
+	x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	virtual/libc"
 
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 8f25ff37306c..1236e3248db2 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/molmol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.14 2007/04/07 04:57:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.15 2007/07/22 07:23:24 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; molmol-2k_p2.ebuild:
+  Drop virtual/x11 references.
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> molmol-2k_p2.ebuild:
   Replace references to *DESTTREE vars with proper calls to the *into functions.
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index ae433a4ef133..6bc1eea8627b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.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/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.10 2007/04/07 04:59:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.11 2007/07/22 07:23:24 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 DEPEND="virtual/motif
-	|| ( x11-libs/libXpm virtual/x11 )
+	x11-libs/libXpm
 	media-libs/mesa
 	media-libs/jpeg
 	media-libs/tiff
diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 97f797c75fba..413dcc11ec99 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/nmrpipe
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/ChangeLog,v 1.12 2007/07/18 09:06:30 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/ChangeLog,v 1.13 2007/07/22 07:24:31 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  nmrpipe-2.5.2006.184.15.37.ebuild:
+  Drop virtual/x11 references.
 
   18 Jul 2007; Jeff Gardner <je_fro@gentoo.org> metadata.xml:
   Add myself as maintainer in metadata.xml
diff --git a/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.ebuild b/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.ebuild
index eee731bbad99..a3a3f93ee089 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.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/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.ebuild,v 1.1 2006/10/18 00:10:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrpipe/nmrpipe-2.5.2006.184.15.37.ebuild,v 1.2 2007/07/22 07:24:31 dberkholz Exp $
 
 DESCRIPTION="Spectral visualisation, analysis and Fourier processing"
 # The specific terms of this license are printed automatically on startup
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}
 	sys-libs/libtermcap-compat
 	sys-libs/ncurses
 	x11-libs/xview
-	|| ( x11-libs/libX11 virtual/x11 )"
+	x11-libs/libX11"
 
 S="${WORKDIR}"
 NMRBASE="/opt/${PN}"
diff --git a/sci-chemistry/nmrview/ChangeLog b/sci-chemistry/nmrview/ChangeLog
index 577f947bbb62..5fb0b268e929 100644
--- a/sci-chemistry/nmrview/ChangeLog
+++ b/sci-chemistry/nmrview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/nmrview
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrview/ChangeLog,v 1.10 2007/02/22 14:48:00 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrview/ChangeLog,v 1.11 2007/07/22 07:26:36 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  nmrview-5.2.2-r3.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org>
   files/digest-nmrview-5.2.2-r3, Manifest:
diff --git a/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild b/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild
index 78598b367865..1ddbceefc8d5 100644
--- a/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild
+++ b/sci-chemistry/nmrview/nmrview-5.2.2-r3.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/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild,v 1.3 2006/07/12 13:38:19 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/nmrview/nmrview-5.2.2-r3.ebuild,v 1.4 2007/07/22 07:26:36 dberkholz Exp $
 
 DESCRIPTION="Visualisation and analysis of processed NMR data"
 LICENSE="as-is"
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE=""
 KEYWORDS="-* x86"
 
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+RDEPEND="x11-libs/libX11"
 
 S="${WORKDIR}"
 
diff --git a/sci-chemistry/ortep3/ChangeLog b/sci-chemistry/ortep3/ChangeLog
index 0116b2253573..c6b526741635 100644
--- a/sci-chemistry/ortep3/ChangeLog
+++ b/sci-chemistry/ortep3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/ortep3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ChangeLog,v 1.5 2007/02/22 01:28:07 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ChangeLog,v 1.6 2007/07/22 07:20:46 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; ortep3-1.0.3.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-chemistry/ortep3/ortep3-1.0.3.ebuild b/sci-chemistry/ortep3/ortep3-1.0.3.ebuild
index 4cd9dd9bfd07..f6200a098d1d 100644
--- a/sci-chemistry/ortep3/ortep3-1.0.3.ebuild
+++ b/sci-chemistry/ortep3/ortep3-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ortep3-1.0.3.ebuild,v 1.1 2005/12/16 05:36:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ortep3/ortep3-1.0.3.ebuild,v 1.2 2007/07/22 07:20:46 dberkholz Exp $
 
 inherit fortran
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 RDEPEND="sci-libs/pgplot
-	|| ( x11-libs/libX11 virtual/x11 )"
+	x11-libs/libX11"
 DEPEND="${RDEPEND}"
 S=${WORKDIR}
 
diff --git a/sci-chemistry/platon/ChangeLog b/sci-chemistry/platon/ChangeLog
index 0b461140c4a6..5a90c1d3f31f 100644
--- a/sci-chemistry/platon/ChangeLog
+++ b/sci-chemistry/platon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/platon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.10 2007/04/26 01:44:07 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/ChangeLog,v 1.11 2007/07/22 07:21:34 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  platon-20060717.ebuild, platon-20070425.ebuild:
+  Drop virtual/x11 references.
 
 *platon-20070425 (26 Apr 2007)
 
diff --git a/sci-chemistry/platon/files/digest-platon-20060717 b/sci-chemistry/platon/files/digest-platon-20060717
index c4b9fbc626d6..9fc9f44b0b1c 100644
--- a/sci-chemistry/platon/files/digest-platon-20060717
+++ b/sci-chemistry/platon/files/digest-platon-20060717
@@ -1,3 +1,3 @@
-MD5 599c1fa6493f8a073e3d84fe3e2292a5 platon-20060717.tar.gz 6818796
-RMD160 b147e41437edabe741fa0b13c4a7acc0a8ef5fc2 platon-20060717.tar.gz 6818796
-SHA256 364eece14916449a974e1c953543c4171c8b2d06b333c6b904ca76fbbb33850f platon-20060717.tar.gz 6818796
+MD5 bbf3ed9ddffbfac8901a160fd47a886c platon-20060717.tar.gz 6693503
+RMD160 22618cd9fd80f3b2b74efe40f6df19ed6e9ed71a platon-20060717.tar.gz 6693503
+SHA256 4c2ca3966f5cb66e951844682f4dc15e498f1d36923a894140f0b5f4a5d32516 platon-20060717.tar.gz 6693503
diff --git a/sci-chemistry/platon/platon-20060717.ebuild b/sci-chemistry/platon/platon-20060717.ebuild
index b737df3032ae..9eac41eb4f4f 100644
--- a/sci-chemistry/platon/platon-20060717.ebuild
+++ b/sci-chemistry/platon/platon-20060717.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/sci-chemistry/platon/platon-20060717.ebuild,v 1.2 2007/04/26 01:44:07 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20060717.ebuild,v 1.3 2007/07/22 07:21:34 dberkholz Exp $
 
 inherit fortran toolchain-funcs
 
@@ -15,7 +15,7 @@ KEYWORDS="~ppc ~x86"
 IUSE=""
 # Can't do libf2c dependent on whether <gcc-4 is selected for the build,
 # so we must always require it
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
+RDEPEND="x11-libs/libX11
 	dev-libs/libf2c"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}"
diff --git a/sci-chemistry/platon/platon-20070425.ebuild b/sci-chemistry/platon/platon-20070425.ebuild
index 4a600d2171eb..5e071ef603f7 100644
--- a/sci-chemistry/platon/platon-20070425.ebuild
+++ b/sci-chemistry/platon/platon-20070425.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/sci-chemistry/platon/platon-20070425.ebuild,v 1.1 2007/04/26 01:44:07 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/platon/platon-20070425.ebuild,v 1.2 2007/07/22 07:21:34 dberkholz Exp $
 
 inherit fortran toolchain-funcs
 
@@ -15,7 +15,7 @@ KEYWORDS="~ppc ~x86"
 IUSE=""
 # Can't do libf2c dependent on whether <gcc-4 is selected for the build,
 # so we must always require it
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
+RDEPEND="x11-libs/libX11
 	dev-libs/libf2c"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}"
diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index aaaf23ec2e51..a1653f48454c 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.12 2007/01/07 23:53:12 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.13 2007/07/22 07:26:04 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  rasmol-2.7.2.1.1-r1.ebuild:
+  Drop virtual/x11 references.
 
   07 Jan 2007; Danny van Dyk <kugelfang@gentoo.org>
   -rasmol-2.7.2.1.1.ebuild:
diff --git a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
index 51515cb1d148..33cb6cad875e 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-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/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.5 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.6 2007/07/22 07:26:04 dberkholz Exp $
 
 inherit toolchain-funcs
 
@@ -15,20 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libXext
-			x11-libs/libXi
-			|| ( x11-apps/xdpyinfo x11-apps/xwininfo )
-		)
-		virtual/x11
-	)"
+RDEPEND="x11-libs/libXext
+	x11-libs/libXi
+	|| ( x11-apps/xdpyinfo x11-apps/xwininfo )"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/inputproto
-			x11-proto/xextproto
-			app-text/rman
-			x11-misc/imake
-		)
-		virtual/x11
-	)"
+	x11-proto/inputproto
+	x11-proto/xextproto
+	app-text/rman
+	x11-misc/imake"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 6ef0b10bcc7d..41d3132b4a36 100644
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/raster3d
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.11 2007/01/07 23:59:05 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.12 2007/07/22 07:25:12 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; raster3d-2.7c.ebuild:
+  Drop virtual/x11 references.
 
   07 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -raster3d-2.6e.ebuild:
   QA: Removed unused versions.
diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
index cf400454cb59..7b13aa155e8f 100644
--- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.7c.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/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.7 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.8 2007/07/22 07:25:12 dberkholz Exp $
 
 inherit toolchain-funcs fortran
 
@@ -20,7 +20,7 @@ RDEPEND="media-libs/jpeg
 	media-libs/tiff"
 
 DEPEND="${RDEPEND}
-	   || ( x11-misc/imake virtual/x11 )"
+	x11-misc/imake"
 
 S="${WORKDIR}/${NAME}_${PV}"
 
diff --git a/sci-chemistry/viewmol/ChangeLog b/sci-chemistry/viewmol/ChangeLog
index 80b48664be34..232d58bf5423 100644
--- a/sci-chemistry/viewmol/ChangeLog
+++ b/sci-chemistry/viewmol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/viewmol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.6 2007/02/22 01:29:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.7 2007/07/22 07:23:58 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; viewmol-2.4.1.ebuild:
+  Drop virtual/x11 references.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-chemistry/viewmol/viewmol-2.4.1.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1.ebuild
index 0aa10927f21f..a345434ba448 100644
--- a/sci-chemistry/viewmol/viewmol-2.4.1.ebuild
+++ b/sci-chemistry/viewmol/viewmol-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1.ebuild,v 1.2 2005/12/02 19:49:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1.ebuild,v 1.3 2007/07/22 07:23:58 dberkholz Exp $
 
 inherit toolchain-funcs eutils
 
@@ -16,21 +16,13 @@ RDEPEND="media-libs/tiff
 	virtual/motif
 	media-libs/libpng
 	>=dev-lang/python-2.2
-	|| ( (
-			x11-libs/libXmu
-			x11-libs/libXaw
-			x11-libs/libXp
-			x11-libs/libXi
-		)
-		virtual/x11
-	)"
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-libs/libXi"
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-proto/inputproto
-			x11-proto/xproto
-		)
-		virtual/x11
-	)"
+	x11-proto/inputproto
+	x11-proto/xproto"
 
 S="${WORKDIR}/${P}/source"
 
diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 20f8cb8bdf3e..cd7f9e797d4d 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.15 2007/04/16 12:47:57 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.16 2007/07/22 07:20:11 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vmd-1.8.5.ebuild,
+  vmd-1.8.6.ebuild:
+  Drop virtual/x11 references.
 
 *vmd-1.8.6 (15 Apr 2007)
 
diff --git a/sci-chemistry/vmd/vmd-1.8.5.ebuild b/sci-chemistry/vmd/vmd-1.8.5.ebuild
index f5529e62ae37..1d88235fe644 100644
--- a/sci-chemistry/vmd/vmd-1.8.5.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.5.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/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.8 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.9 2007/07/22 07:20:11 dberkholz Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -16,7 +16,7 @@ IUSE="hardened"
 RESTRICT="fetch"
 
 DEPEND="app-shells/tcsh
-	|| ( x11-libs/libXft virtual/x11 )
+	x11-libs/libXft
 	virtual/opengl
 	x11-libs/fltk
 	=dev-lang/tcl-8.4*
diff --git a/sci-chemistry/vmd/vmd-1.8.6.ebuild b/sci-chemistry/vmd/vmd-1.8.6.ebuild
index 287a6dc8ed18..bb30cb8352c3 100644
--- a/sci-chemistry/vmd/vmd-1.8.6.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.6.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/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.3 2007/07/13 05:48:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.4 2007/07/22 07:20:11 dberkholz Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -16,7 +16,7 @@ IUSE=""
 RESTRICT="fetch"
 
 DEPEND="app-shells/tcsh
-	|| ( x11-libs/libXft virtual/x11 )
+	x11-libs/libXft
 	virtual/opengl
 	x11-libs/fltk
 	=dev-lang/tcl-8.4*