Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

10 files changed, 60 insertions, 64 deletions

diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index 3c25e2d84ba2..7e0583249513 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/amiwm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.7 2007/02/21 22:35:38 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.8 2007/07/22 04:27:07 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> amiwm-0.20_p48.ebuild:
+  Remove virtual/x11 from dependencies.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-wm/amiwm/amiwm-0.20_p48.ebuild b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
index 124d1ddadf8b..435b9ad6a6c7 100644
--- a/x11-wm/amiwm/amiwm-0.20_p48.ebuild
+++ b/x11-wm/amiwm/amiwm-0.20_p48.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/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.7 2006/02/11 11:28:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.8 2007/07/22 04:27:07 omp Exp $
 
 inherit eutils
 
@@ -14,16 +14,12 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index bbd1a4628586..187b8f8d9ab8 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.126 2007/02/07 19:45:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.127 2007/07/22 04:25:55 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> icewm-1.2.30.ebuild:
+  Remove virtual/x11 from dependencies.
 
   07 Feb 2007; Simon Stelling <blubb@gentoo.org> icewm-1.2.30.ebuild:
   stable on amd64; bug 16879
diff --git a/x11-wm/icewm/icewm-1.2.30.ebuild b/x11-wm/icewm/icewm-1.2.30.ebuild
index a861c4388780..beb5f02395b0 100644
--- a/x11-wm/icewm/icewm-1.2.30.ebuild
+++ b/x11-wm/icewm/icewm-1.2.30.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/x11-wm/icewm/icewm-1.2.30.ebuild,v 1.6 2007/02/07 19:45:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.30.ebuild,v 1.7 2007/07/22 04:25:55 omp Exp $
 
 inherit eutils
 
@@ -20,15 +20,13 @@ KEYWORDS="amd64 ppc sparc x86"
 
 IUSE="esd imlib nls spell truetype xinerama minimal debug"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXft
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
 	esd? ( media-sound/esound )
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
 	nls? ( sys-devel/gettext )
@@ -36,11 +34,9 @@ RDEPEND="|| ( (
 	media-libs/giflib"
 
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
 	>=sys-apps/sed-4"
 
 pkg_setup() {
diff --git a/x11-wm/ion/ChangeLog b/x11-wm/ion/ChangeLog
index 88d44f0d0999..9a73f0455f96 100644
--- a/x11-wm/ion/ChangeLog
+++ b/x11-wm/ion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/ion
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ChangeLog,v 1.18 2006/07/15 16:29:14 nelchael Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ChangeLog,v 1.19 2007/07/22 04:24:27 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> ion-20020207-r2.ebuild:
+  Remove virtual/x11 from dependencies.
 
   15 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -ion-20020207-r1.ebuild, ion-20020207-r2.ebuild:
diff --git a/x11-wm/ion/ion-20020207-r2.ebuild b/x11-wm/ion/ion-20020207-r2.ebuild
index 135d1f48e724..256323a834db 100644
--- a/x11-wm/ion/ion-20020207-r2.ebuild
+++ b/x11-wm/ion/ion-20020207-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/x11-wm/ion/ion-20020207-r2.ebuild,v 1.5 2006/07/15 16:29:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ion-20020207-r2.ebuild,v 1.6 2007/07/22 04:24:27 omp Exp $
 
 inherit eutils
 
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE=""
 
-RDEPEND="|| (
-	x11-libs/libX11
-	virtual/x11
-	)"
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
diff --git a/x11-wm/larswm/ChangeLog b/x11-wm/larswm/ChangeLog
index fc704bd70a9c..03048434a6ea 100644
--- a/x11-wm/larswm/ChangeLog
+++ b/x11-wm/larswm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/larswm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.18 2007/02/21 22:38:32 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.19 2007/07/22 04:23:29 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> larswm-7.5.3.ebuild:
+  Remove virtual/x11 from dependencies.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-wm/larswm/larswm-7.5.3.ebuild b/x11-wm/larswm/larswm-7.5.3.ebuild
index db8f86a2055f..91d1e572b15e 100644
--- a/x11-wm/larswm/larswm-7.5.3.ebuild
+++ b/x11-wm/larswm/larswm-7.5.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/x11-wm/larswm/larswm-7.5.3.ebuild,v 1.9 2006/02/11 11:58:18 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.3.ebuild,v 1.10 2007/07/22 04:23:28 omp Exp $
 
 DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan."
 HOMEPAGE="http://larswm.fnurt.net/"
@@ -11,20 +11,16 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-misc/imake
-		x11-misc/gccmakedep
-		app-text/rman )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake
+	x11-misc/gccmakedep
+	app-text/rman"
 
 src_compile() {
 	xmkmf -a || die
diff --git a/x11-wm/lwm/ChangeLog b/x11-wm/lwm/ChangeLog
index 4d47d23698ac..2631bbe0b21a 100644
--- a/x11-wm/lwm/ChangeLog
+++ b/x11-wm/lwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/lwm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.18 2007/02/21 22:39:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.19 2007/07/22 04:22:21 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> lwm-1.2.1.ebuild:
+  Remove virtual/x11 from dependencies.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-wm/lwm/lwm-1.2.1.ebuild b/x11-wm/lwm/lwm-1.2.1.ebuild
index 3280f9ee7f14..285492e85037 100644
--- a/x11-wm/lwm/lwm-1.2.1.ebuild
+++ b/x11-wm/lwm/lwm-1.2.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/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.5 2006/02/11 12:01:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.6 2007/07/22 04:22:21 omp Exp $
 
 IUSE=""
 
@@ -12,16 +12,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc sparc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXext )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-misc/imake )
-	virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-misc/imake"
 
 src_compile() {
 	xmkmf || die