Remove virtual/x11 from dependencies.

(Portage version: 2.1.3_rc8)

4 files changed, 29 insertions, 37 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 2d13ca613148..5e41de3fc5a5 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.140 2007/03/23 19:29:55 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.141 2007/07/22 03:59:23 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> fvwm-2.5.18-r1.ebuild,
+  fvwm-2.5.19.ebuild, fvwm-2.5.21.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *fvwm-2.5.21 (23 Mar 2007)
 
diff --git a/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild
index 0e3ff4d6fd86..45f2a2598b00 100644
--- a/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.18-r1.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/fvwm/fvwm-2.5.18-r1.ebuild,v 1.12 2007/02/22 05:48:36 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild,v 1.13 2007/07/22 03:59:23 omp Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,22 +27,18 @@ RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
 		dev-lang/perl
 		sys-libs/zlib
 		sys-apps/debianutils
-		|| ( (
-			x11-libs/libXpm
-			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )"
+		x11-libs/libXpm
+		x11-libs/libXft
+		xinerama? ( x11-libs/libXinerama )"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
 # XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		|| ( (
-			x11-libs/libXrandr
-			x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )"
+		x11-libs/libXrandr
+		x11-proto/xextproto
+		x11-proto/xproto
+		xinerama? ( x11-proto/xineramaproto )"
 
 src_unpack() {
 	unpack ${A}; export EPATCH_OPTS="-F3 -l"
diff --git a/x11-wm/fvwm/fvwm-2.5.19.ebuild b/x11-wm/fvwm/fvwm-2.5.19.ebuild
index b7c969f22b79..469c61b28385 100644
--- a/x11-wm/fvwm/fvwm-2.5.19.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.19.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/fvwm/fvwm-2.5.19.ebuild,v 1.5 2007/02/22 05:48:36 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.19.ebuild,v 1.6 2007/07/22 03:59:23 omp Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,22 +27,18 @@ RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
 		userland_GNU? ( sys-apps/debianutils )
 		dev-lang/perl
 		sys-libs/zlib
-		|| ( (
-			x11-libs/libXpm
-			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )"
+		x11-libs/libXpm
+		x11-libs/libXft
+		xinerama? ( x11-libs/libXinerama )"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
 # XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		|| ( (
-			x11-libs/libXrandr
-			x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )"
+		x11-libs/libXrandr
+		x11-proto/xextproto
+		x11-proto/xproto
+		xinerama? ( x11-proto/xineramaproto )"
 
 src_unpack() {
 	unpack ${A}; export EPATCH_OPTS="-F3 -l"
diff --git a/x11-wm/fvwm/fvwm-2.5.21.ebuild b/x11-wm/fvwm/fvwm-2.5.21.ebuild
index 0d0218e73ee2..c4acefc3f6f4 100644
--- a/x11-wm/fvwm/fvwm-2.5.21.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.21.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/fvwm/fvwm-2.5.21.ebuild,v 1.1 2007/03/23 19:29:55 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.21.ebuild,v 1.2 2007/07/22 03:59:23 omp Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,22 +27,18 @@ RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
 		userland_GNU? ( sys-apps/debianutils )
 		dev-lang/perl
 		sys-libs/zlib
-		|| ( (
-			x11-libs/libXpm
-			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )"
+		x11-libs/libXpm
+		x11-libs/libXft
+		xinerama? ( x11-libs/libXinerama )"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
 # XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		|| ( (
-			x11-libs/libXrandr
-			x11-proto/xextproto
-			x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )"
+		x11-libs/libXrandr
+		x11-proto/xextproto
+		x11-proto/xproto
+		xinerama? ( x11-proto/xineramaproto )"
 
 src_unpack() {
 	unpack ${A}; export EPATCH_OPTS="-F3 -l"