Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

9 files changed, 42 insertions, 44 deletions

diff --git a/dev-util/ddd/ChangeLog b/dev-util/ddd/ChangeLog
index 2d780c6c0705..210a41ffdba3 100644
--- a/dev-util/ddd/ChangeLog
+++ b/dev-util/ddd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/ddd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.47 2006/08/28 19:07:18 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.48 2007/07/22 07:26:22 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> ddd-3.3.11.ebuild:
+  Drop virtual/x11 references.
 
   28 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/ddd-3.3.1-detect-hipot.patch, -files/ddd-3.3.1-gcc3-gentoo.patch,
diff --git a/dev-util/ddd/ddd-3.3.11.ebuild b/dev-util/ddd/ddd-3.3.11.ebuild
index 5b6dc2fd4306..8136e9653767 100644
--- a/dev-util/ddd/ddd-3.3.11.ebuild
+++ b/dev-util/ddd/ddd-3.3.11.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/dev-util/ddd/ddd-3.3.11.ebuild,v 1.12 2006/08/28 18:56:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.11.ebuild,v 1.13 2007/07/22 07:26:22 graaff Exp $
 
 inherit eutils
 
@@ -13,11 +13,8 @@ LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libXaw
-			x11-libs/libXp
-		)
-		virtual/x11
-	)
+DEPEND="x11-libs/libXaw
+	x11-libs/libXp
 	>=sys-devel/gcc-3
 	>=sys-devel/gdb-6.4
 	virtual/motif"
diff --git a/dev-util/insight/ChangeLog b/dev-util/insight/ChangeLog
index bdb6059a9d95..ec0bde9b4ddf 100644
--- a/dev-util/insight/ChangeLog
+++ b/dev-util/insight/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/insight
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.39 2007/04/09 12:15:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.40 2007/07/22 07:24:10 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> insight-6.5.ebuild:
+  Drop virtual/x11 references.
 
   09 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> insight-6.5.ebuild:
   Use doenvd for bug #173884.
diff --git a/dev-util/insight/insight-6.5.ebuild b/dev-util/insight/insight-6.5.ebuild
index f34eb4271058..29c6553f33e2 100644
--- a/dev-util/insight/insight-6.5.ebuild
+++ b/dev-util/insight/insight-6.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/dev-util/insight/insight-6.5.ebuild,v 1.8 2007/04/09 12:15:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.5.ebuild,v 1.9 2007/07/22 07:24:10 graaff Exp $
 
 inherit eutils
 
@@ -10,8 +10,9 @@ DESCRIPTION="A graphical interface to the GNU debugger"
 HOMEPAGE="http://sourceware.org/insight/"
 LICENSE="GPL-2 LGPL-2"
 RDEPEND="sys-libs/ncurses
-	|| ( x11-libs/libX11 virtual/x11 )"
-DEPEND="|| ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 )
+	x11-libs/libX11"
+DEPEND="x11-libs/libXt
+	x11-libs/libX11
 	nls? ( sys-devel/gettext )
 	sys-libs/ncurses"
 
diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index a3dc4b63a2c5..4dddca3df137 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/rhide
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.22 2007/06/25 10:54:44 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.23 2007/07/22 07:21:22 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> rhide-1.5.20050823.ebuild:
+  Drop virtual/x11 references.
 
   25 Jun 2007; Piotr Jaroszyński <peper@gentoo.org>
   rhide-1.5.20050823.ebuild:
diff --git a/dev-util/rhide/rhide-1.5.20050823.ebuild b/dev-util/rhide/rhide-1.5.20050823.ebuild
index 52312c8a2304..9e56e919a33e 100644
--- a/dev-util/rhide/rhide-1.5.20050823.ebuild
+++ b/dev-util/rhide/rhide-1.5.20050823.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/dev-util/rhide/rhide-1.5.20050823.ebuild,v 1.8 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5.20050823.ebuild,v 1.9 2007/07/22 07:21:22 graaff Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -49,11 +49,10 @@ RDEPEND="virtual/libc
 	>=sys-libs/gpm-1.20.0
 	>=sys-libs/ncurses-5.2
 	aalib? ( media-libs/aalib )
-	X? ( || ( ( x11-libs/libX11
-		x11-libs/libXmu ) virtual/x11 ) )
+	X? ( x11-libs/libX11	x11-libs/libXmu )
 	>=sys-apps/sed-4.0.7"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xproto virtual/x11 ) )"
+	X? ( x11-proto/xproto )"
 
 TV_S="${WORKDIR}/tvision"
 SE_S="${WORKDIR}/setedit"
diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index 64bb5dbeaa5a..2f7382f2b5f3 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/sourcenav
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.18 2006/07/20 04:58:45 nerdboy Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.19 2007/07/22 07:18:14 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> sourcenav-5.1.4.ebuild,
+  sourcenav-5.2_beta2.ebuild:
+  Drop virtual/x11 references.
 
   20 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
   +files/sourcenav-5.1.4-bash3.patch, +files/sourcenav-5.1.4-gcc4.patch,
diff --git a/dev-util/sourcenav/sourcenav-5.1.4.ebuild b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
index 1bef1c6839b5..70d3f9757b3f 100644
--- a/dev-util/sourcenav/sourcenav-5.1.4.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.1.4.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/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.10 2006/07/20 04:58:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.11 2007/07/22 07:18:14 graaff Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -17,19 +17,13 @@ KEYWORDS="amd64 sparc ppc ppc64 x86"
 IUSE=""
 SN="/opt/sourcenav"
 
-RDEPEND="|| (
-	  ( x11-libs/libX11
-	    x11-libs/libXdmcp
-	    x11-libs/libXaw )
-	virtual/x11
-	)
+RDEPEND="x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXaw
 	sys-libs/glibc"
 
 DEPEND="${RDEPEND}
-	|| (
-	 ( x11-proto/xproto )
-	virtual/x11
-	)"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index eff8579e5213..9275ec53fd54 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.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/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.8 2006/07/20 04:58:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.9 2007/07/22 07:18:14 graaff Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,19 +19,13 @@ SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~sparc ~ppc ~ppc64 ~x86"
 
-RDEPEND="|| (
-	  ( x11-libs/libX11
-	    x11-libs/libXdmcp
-	    x11-libs/libXaw )
-	virtual/x11
-	)
+RDEPEND="x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXaw
 	sys-libs/glibc"
 
 DEPEND="${RDEPEND}
-	|| (
-	 ( x11-proto/xproto )
-	virtual/x11
-	)"
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}