Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

11 files changed, 43 insertions, 41 deletions

diff --git a/dev-lang/anubis/ChangeLog b/dev-lang/anubis/ChangeLog
index 65a49809547e..f5906e3e6195 100644
--- a/dev-lang/anubis/ChangeLog
+++ b/dev-lang/anubis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/anubis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/anubis/ChangeLog,v 1.2 2007/07/15 09:13:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/anubis/ChangeLog,v 1.3 2007/07/22 09:03:16 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> anubis-1.7.0.1.ebuild:
+  Drop virtual/x11 references.
 
   15 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Assigning to m-needed, as nattfodd is being retired (#108329).
diff --git a/dev-lang/anubis/anubis-1.7.0.1.ebuild b/dev-lang/anubis/anubis-1.7.0.1.ebuild
index 9c1d1b7736b3..9cdae937b118 100644
--- a/dev-lang/anubis/anubis-1.7.0.1.ebuild
+++ b/dev-lang/anubis/anubis-1.7.0.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/dev-lang/anubis/anubis-1.7.0.1.ebuild,v 1.1 2006/07/30 10:47:38 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/anubis/anubis-1.7.0.1.ebuild,v 1.2 2007/07/22 09:03:16 graaff Exp $
 
 inherit versionator
 
@@ -17,8 +17,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="media-libs/jpeg
 		dev-libs/openssl
-		|| ( x11-libs/libX11
-			virtual/x11 )"
+		x11-libs/libX11"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 8b3e7169acce..647528a2cf7c 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.127 2007/07/11 09:01:23 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.128 2007/07/22 08:58:59 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> ghc-6.4.2.ebuild:
+  Drop virtual/x11 references.
 
   11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> ghc-6.6.1.ebuild:
   Add ia64 binary for ghc-6.6.1. Added ~ia64 to keywords.
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 02f67420ef1e..67f7dd08b2b3 100644
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.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/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.20 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.21 2007/07/22 08:58:59 graaff Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
 	>=sys-libs/readline-4.2
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	X? ( x11-libs/libX11 )
 	opengl? ( virtual/opengl
 			  virtual/glu virtual/glut
 			  openal? ( media-libs/openal media-libs/freealut ) )"
diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index f176d40c8fab..c41c053adc75 100644
--- a/dev-lang/hugs98/ChangeLog
+++ b/dev-lang/hugs98/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/hugs98
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.43 2006/10/03 23:21:46 dcoutts Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.44 2007/07/22 08:56:18 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> hugs98-2005.3-r2.ebuild:
+  Drop virtual/x11 references.
 
   03 Oct 2006; Duncan Coutts <dcoutts@gentoo.org> hugs98-2005.3-r2.ebuild:
   Use eselect-opengl rather than deprecated opengl-update. Fixes bug #147244
diff --git a/dev-lang/hugs98/hugs98-2005.3-r2.ebuild b/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
index e9e230f062e4..0b96584efcca 100644
--- a/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
+++ b/dev-lang/hugs98/hugs98-2005.3-r2.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-lang/hugs98/hugs98-2005.3-r2.ebuild,v 1.18 2006/10/03 23:21:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r2.ebuild,v 1.19 2007/07/22 08:56:18 graaff Exp $
 
 inherit base flag-o-matic eutils versionator multilib
 
@@ -42,7 +42,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 LICENSE="as-is"
 
 RDEPEND="
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	X? ( x11-libs/libX11 )
 	opengl? ( virtual/opengl virtual/glu virtual/glut )
 	openal? ( media-libs/openal )"
 DEPEND="${RDEPEND}
diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index 034c731dbe99..227978caf6da 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/icon
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.24 2007/02/22 00:05:38 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.25 2007/07/22 08:53:40 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> icon-9.4.2.ebuild,
+  icon-9.4.3.ebuild, icon-9.4.3-r1.ebuild, icon-9.4.3-r2.ebuild:
+  Drop virtual/x11 references. Drop ppc-macos keyword due to missing keyword
+  with X dependencies.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-lang/icon/icon-9.4.2.ebuild b/dev-lang/icon/icon-9.4.2.ebuild
index e91f73241455..1972c045e08c 100644
--- a/dev-lang/icon/icon-9.4.2.ebuild
+++ b/dev-lang/icon/icon-9.4.2.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-lang/icon/icon-9.4.2.ebuild,v 1.4 2006/03/16 14:02:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.2.ebuild,v 1.5 2007/07/22 08:53:40 graaff Exp $
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -9,14 +9,12 @@ DESCRIPTION="very high level language"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc-macos ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="X"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( || (
-		( x11-libs/libX11 x11-libs/libXpm )
-	virtual/x11 ) )
+DEPEND="X? ( x11-libs/libX11 x11-libs/libXpm )
 	sys-devel/gcc"
 
 src_unpack() {
diff --git a/dev-lang/icon/icon-9.4.3-r1.ebuild b/dev-lang/icon/icon-9.4.3-r1.ebuild
index 53221504308e..3c637daa390f 100644
--- a/dev-lang/icon/icon-9.4.3-r1.ebuild
+++ b/dev-lang/icon/icon-9.4.3-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/dev-lang/icon/icon-9.4.3-r1.ebuild,v 1.1 2006/04/01 12:22:18 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r1.ebuild,v 1.2 2007/07/22 08:53:40 graaff Exp $
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -9,19 +9,16 @@ DESCRIPTION="very high level language"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 IUSE="X iplsrc"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( || (
-		( x11-proto/xextproto
+DEPEND="X? ( x11-proto/xextproto
 			x11-proto/xproto
 			x11-libs/libX11
 			x11-libs/libXpm
 			x11-libs/libXt )
-		virtual/x11 )
-	)
 	sys-devel/gcc"
 
 src_compile() {
diff --git a/dev-lang/icon/icon-9.4.3-r2.ebuild b/dev-lang/icon/icon-9.4.3-r2.ebuild
index e6c5489a9337..0a7420217c01 100644
--- a/dev-lang/icon/icon-9.4.3-r2.ebuild
+++ b/dev-lang/icon/icon-9.4.3-r2.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-lang/icon/icon-9.4.3-r2.ebuild,v 1.6 2006/09/25 07:53:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r2.ebuild,v 1.7 2007/07/22 08:53:40 graaff Exp $
 
 inherit eutils
 
@@ -11,19 +11,16 @@ DESCRIPTION="very high level language"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc-macos ~ppc64 sparc x86"
+KEYWORDS="alpha ~amd64 ~ppc64 sparc x86"
 IUSE="X iplsrc"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( || (
-		( x11-proto/xextproto
+DEPEND="X? ( x11-proto/xextproto
 			x11-proto/xproto
 			x11-libs/libX11
 			x11-libs/libXpm
 			x11-libs/libXt )
-		virtual/x11 )
-	)
 	sys-devel/gcc"
 
 src_unpack() {
diff --git a/dev-lang/icon/icon-9.4.3.ebuild b/dev-lang/icon/icon-9.4.3.ebuild
index c50115eefe93..f72119a6554f 100644
--- a/dev-lang/icon/icon-9.4.3.ebuild
+++ b/dev-lang/icon/icon-9.4.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/dev-lang/icon/icon-9.4.3.ebuild,v 1.4 2006/03/27 13:31:47 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3.ebuild,v 1.5 2007/07/22 08:53:40 graaff Exp $
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -9,19 +9,16 @@ DESCRIPTION="very high level language"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc-macos sparc ~x86"
+KEYWORDS="~alpha ~amd64 sparc ~x86"
 IUSE="X iplsrc"
 
 S=${WORKDIR}/icon.v${MY_PV}src
 
-DEPEND="X? ( || (
-		( x11-proto/xextproto
+DEPEND="X? ( x11-proto/xextproto
 			x11-proto/xproto
 			x11-libs/libX11
 			x11-libs/libXpm
 			x11-libs/libXt )
-		virtual/x11 )
-	)
 	sys-devel/gcc"
 
 src_unpack() {