Remove virtual/x11 from dependencies.

(Portage version: 2.1.3_rc8)

6 files changed, 57 insertions, 85 deletions

diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog
index 8eeec9333337..317a6ca9e5bd 100644
--- a/x11-wm/jwm/ChangeLog
+++ b/x11-wm/jwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/jwm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.11 2007/03/13 14:58:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.12 2007/07/22 04:44:15 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> jwm-0.21.ebuild,
+  jwm-0.22.ebuild, jwm-0.23.ebuild, jwm-1.5.ebuild, jwm-1.7.ebuild:
+  Remove virtual/x11 from dependencies.
 
   13 Mar 2007; Raúl Porcel <armin76@gentoo.org> jwm-1.7.ebuild:
   x86 stable
diff --git a/x11-wm/jwm/jwm-0.21.ebuild b/x11-wm/jwm/jwm-0.21.ebuild
index 37476fd32b22..1fa2d6a5ea05 100644
--- a/x11-wm/jwm/jwm-0.21.ebuild
+++ b/x11-wm/jwm/jwm-0.21.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/jwm/jwm-0.21.ebuild,v 1.5 2006/02/11 11:53:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.6 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ppc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-0.22.ebuild b/x11-wm/jwm/jwm-0.22.ebuild
index 8b4bf0424ac3..e182648f8b1e 100644
--- a/x11-wm/jwm/jwm-0.22.ebuild
+++ b/x11-wm/jwm/jwm-0.22.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/jwm/jwm-0.22.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.22.ebuild,v 1.3 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-0.23.ebuild b/x11-wm/jwm/jwm-0.23.ebuild
index 544d6218b34e..e234adf204bf 100644
--- a/x11-wm/jwm/jwm-0.23.ebuild
+++ b/x11-wm/jwm/jwm-0.23.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/jwm/jwm-0.23.ebuild,v 1.3 2006/02/11 12:53:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.23.ebuild,v 1.4 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="hppa ~ppc ~x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-1.5.ebuild b/x11-wm/jwm/jwm-1.5.ebuild
index 4c607769ebf3..d2b6f4ccaefc 100644
--- a/x11-wm/jwm/jwm-1.5.ebuild
+++ b/x11-wm/jwm/jwm-1.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/x11-wm/jwm/jwm-1.5.ebuild,v 1.5 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-1.5.ebuild,v 1.6 2007/07/22 04:44:15 omp Exp $
 
 inherit autotools eutils
 
@@ -14,30 +14,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~hppa ~ppc ~x86"
 
-RDEPEND="|| ( (
-				xpm? ( x11-libs/libXpm )
-				truetype? ( x11-libs/libXft )
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXext
-				x11-libs/libXrender
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				)
-				virtual/x11
-			)
-		truetype? ( virtual/xft )
-		png? ( media-libs/libpng )
-		bidi? ( dev-libs/fribidi )
-		dev-libs/expat"
-
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( virtual/xft )
+	png? ( media-libs/libpng )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
 DEPEND="${RDEPEND}
-		|| ( (
-				x11-proto/xproto
-				x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-			)"
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	epatch "${FILESDIR}/${P}-configure.in.patch"
diff --git a/x11-wm/jwm/jwm-1.7.ebuild b/x11-wm/jwm/jwm-1.7.ebuild
index bdd2ec01aebb..0ee804c4e0cb 100644
--- a/x11-wm/jwm/jwm-1.7.ebuild
+++ b/x11-wm/jwm/jwm-1.7.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/jwm/jwm-1.7.ebuild,v 1.4 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-1.7.ebuild,v 1.5 2007/07/22 04:44:15 omp Exp $
 
 inherit autotools eutils
 
@@ -14,30 +14,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~hppa ~ppc x86"
 
-RDEPEND="|| ( (
-				xpm? ( x11-libs/libXpm )
-				truetype? ( x11-libs/libXft )
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXext
-				x11-libs/libXrender
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				)
-				virtual/x11
-			)
-		truetype? ( virtual/xft )
-		png? ( media-libs/libpng )
-		bidi? ( dev-libs/fribidi )
-		dev-libs/expat"
-
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( virtual/xft )
+	png? ( media-libs/libpng )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
 DEPEND="${RDEPEND}
-		|| ( (
-				x11-proto/xproto
-				x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-			)"
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	econf \