Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

9 files changed, 32 insertions, 38 deletions

diff --git a/sci-electronics/chipmunksystem/ChangeLog b/sci-electronics/chipmunksystem/ChangeLog
index 85fb14e9518c..abfa86aec14c 100644
--- a/sci-electronics/chipmunksystem/ChangeLog
+++ b/sci-electronics/chipmunksystem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/chipmunksystem
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/ChangeLog,v 1.10 2006/10/15 16:55:45 calchan Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/ChangeLog,v 1.11 2007/07/22 07:17:13 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  chipmunksystem-20060624.ebuild:
+  Drop virtual/x11 references.
 
   15 Oct 2006; Denis Dupeyron <calchan@gentoo.org>
   -chipmunksystem-20031105-r3.ebuild:
diff --git a/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild b/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild
index abfee3443338..23786d2eb839 100644
--- a/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild
+++ b/sci-electronics/chipmunksystem/chipmunksystem-20060624.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-electronics/chipmunksystem/chipmunksystem-20060624.ebuild,v 1.2 2006/07/07 17:21:49 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/chipmunksystem/chipmunksystem-20060624.ebuild,v 1.3 2007/07/22 07:17:13 dberkholz Exp $
 
 inherit toolchain-funcs
 
@@ -32,16 +32,10 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 RDEPEND="virtual/libc
-	|| (
-		virtual/x11
-		x11-libs/libX11
-	   )"
+	x11-libs/libX11"
 
 DEPEND="${RDEPEND}
-		|| (
-			virtual/x11
-			x11-proto/xproto
-		   )"
+	x11-proto/xproto"
 
 src_compile() {
 	local COMPILING_ERROR
diff --git a/sci-electronics/pcb/ChangeLog b/sci-electronics/pcb/ChangeLog
index 6755e80c384d..8e55038cc408 100644
--- a/sci-electronics/pcb/ChangeLog
+++ b/sci-electronics/pcb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/pcb
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.32 2007/02/18 16:01:36 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.33 2007/07/22 07:16:24 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; pcb-20060822.ebuild,
+  pcb-20070208.ebuild:
+  Drop virtual/x11 references.
 
   18 Feb 2007; Denis Dupeyron <calchan@gentoo.org> pcb-20070208.ebuild:
   Fixed keywords.
diff --git a/sci-electronics/pcb/pcb-20060822.ebuild b/sci-electronics/pcb/pcb-20060822.ebuild
index a45552a55c4e..b3850b25e2db 100644
--- a/sci-electronics/pcb/pcb-20060822.ebuild
+++ b/sci-electronics/pcb/pcb-20060822.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-electronics/pcb/pcb-20060822.ebuild,v 1.7 2007/01/28 10:30:09 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20060822.ebuild,v 1.8 2007/07/22 07:16:24 dberkholz Exp $
 
 inherit eutils
 
@@ -17,10 +17,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	media-libs/gd"
 DEPEND="${RDEPEND}
 	=dev-lang/tk-8*
-	|| (
-		virtual/x11
-		x11-proto/xproto
-	   )
+	x11-proto/xproto
 	dev-util/pkgconfig"
 
 src_unpack() {
diff --git a/sci-electronics/pcb/pcb-20070208.ebuild b/sci-electronics/pcb/pcb-20070208.ebuild
index 47c882ce9478..e7ef4ecf44cc 100644
--- a/sci-electronics/pcb/pcb-20070208.ebuild
+++ b/sci-electronics/pcb/pcb-20070208.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-electronics/pcb/pcb-20070208.ebuild,v 1.2 2007/02/18 16:01:36 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20070208.ebuild,v 1.3 2007/07/22 07:16:24 dberkholz Exp $
 
 inherit eutils
 
@@ -19,10 +19,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	png? ( media-libs/gd )"
 DEPEND="${RDEPEND}
 	=dev-lang/tk-8*
-	|| (
-		virtual/x11
-		x11-proto/xproto
-	   )
+	x11-proto/xproto
 	dev-util/pkgconfig"
 
 pkg_setup() {
diff --git a/sci-electronics/xcircuit/ChangeLog b/sci-electronics/xcircuit/ChangeLog
index e50cb3e896d4..2cf5c46ad5be 100644
--- a/sci-electronics/xcircuit/ChangeLog
+++ b/sci-electronics/xcircuit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/xcircuit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.28 2007/04/09 20:08:33 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.29 2007/07/22 07:15:27 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xcircuit-3.4.18.ebuild, xcircuit-3.4.26.ebuild, xcircuit-3.6.86.ebuild:
+  Drop virtual/x11 references.
 
   09 Apr 2007; Denis Dupeyron <calchan@gentoo.org> -xcircuit-3.6.59.ebuild:
   Removed old development-branch ebuild.
diff --git a/sci-electronics/xcircuit/xcircuit-3.4.18.ebuild b/sci-electronics/xcircuit/xcircuit-3.4.18.ebuild
index 828d5395969b..2172b9d3596c 100644
--- a/sci-electronics/xcircuit/xcircuit-3.4.18.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.4.18.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-electronics/xcircuit/xcircuit-3.4.18.ebuild,v 1.8 2006/06/06 16:10:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.4.18.ebuild,v 1.9 2007/07/22 07:15:27 dberkholz Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -13,9 +13,7 @@ IUSE=""
 
 DEPEND="virtual/ghostscript
 	dev-lang/tk
-	|| ( x11-libs/libXt
-	     virtual/x11
-	)"
+	x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-electronics/xcircuit/xcircuit-3.4.26.ebuild b/sci-electronics/xcircuit/xcircuit-3.4.26.ebuild
index d923578297bd..a49528beb8a8 100644
--- a/sci-electronics/xcircuit/xcircuit-3.4.26.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.4.26.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-electronics/xcircuit/xcircuit-3.4.26.ebuild,v 1.1 2006/07/22 16:48:28 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.4.26.ebuild,v 1.2 2007/07/22 07:15:27 dberkholz Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -16,9 +16,7 @@ RESTRICT="test"
 
 DEPEND="virtual/ghostscript
 	dev-lang/tk
-	|| ( x11-libs/libXt
-	     virtual/x11
-	)"
+	x11-libs/libXt"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-electronics/xcircuit/xcircuit-3.6.86.ebuild b/sci-electronics/xcircuit/xcircuit-3.6.86.ebuild
index 79e7ca1ff5db..377aa710edcc 100644
--- a/sci-electronics/xcircuit/xcircuit-3.6.86.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.6.86.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-electronics/xcircuit/xcircuit-3.6.86.ebuild,v 1.1 2007/04/01 13:08:01 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.6.86.ebuild,v 1.2 2007/07/22 07:15:27 dberkholz Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -17,9 +17,7 @@ RESTRICT="test"
 
 DEPEND="virtual/ghostscript
 	dev-lang/tk
-	|| ( x11-libs/libXt
-	     virtual/x11
-	)"
+	x11-libs/libXt"
 
 src_compile() {
 	econf \