Drop virtual/x11 references.

(Portage version: 2.1.2.9)

5 files changed, 22 insertions, 28 deletions

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() {