Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

24 files changed, 101 insertions, 107 deletions

diff --git a/app-text/clara/ChangeLog b/app-text/clara/ChangeLog
index 24d7697a5c93..33414e9de132 100644
--- a/app-text/clara/ChangeLog
+++ b/app-text/clara/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/clara
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/clara/ChangeLog,v 1.13 2007/02/10 14:01:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/clara/ChangeLog,v 1.14 2007/07/22 10:10:27 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> clara-20031214.ebuild:
+  Remove virtual/x11 from dependencies.
 
   10 Feb 2007; Fabian Groffen <grobian@gentoo.org> clara-20031214.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/app-text/clara/clara-20031214.ebuild b/app-text/clara/clara-20031214.ebuild
index ea623ce7e330..f1a9c6cda351 100644
--- a/app-text/clara/clara-20031214.ebuild
+++ b/app-text/clara/clara-20031214.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/app-text/clara/clara-20031214.ebuild,v 1.15 2007/02/10 14:01:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/clara/clara-20031214.ebuild,v 1.16 2007/07/22 10:10:27 omp Exp $
 
 DESCRIPTION="An OCR (Optical Character Recognition) program"
 SRC_URI="http://www.geocities.com/claraocr/clara-20031214.tar.gz"
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="x11-libs/libX11"
 
 src_compile() {
 	emake || die
diff --git a/app-text/dvibook/ChangeLog b/app-text/dvibook/ChangeLog
index 8a2949e29ae3..ba2582944a48 100644
--- a/app-text/dvibook/ChangeLog
+++ b/app-text/dvibook/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/dvibook
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvibook/ChangeLog,v 1.9 2007/03/12 23:48:30 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvibook/ChangeLog,v 1.10 2007/07/22 10:11:31 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> dvibook-20001129.ebuild:
+  Remove virtual/x11 from dependencies.
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/app-text/dvibook/dvibook-20001129.ebuild b/app-text/dvibook/dvibook-20001129.ebuild
index 668c380f147f..1d90982f2703 100644
--- a/app-text/dvibook/dvibook-20001129.ebuild
+++ b/app-text/dvibook/dvibook-20001129.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/app-text/dvibook/dvibook-20001129.ebuild,v 1.7 2006/02/11 15:17:42 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvibook/dvibook-20001129.ebuild,v 1.8 2007/07/22 10:11:31 omp Exp $
 
 inherit eutils
 
@@ -14,10 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
-DEPEND="|| ( ( x11-misc/imake
-				x11-misc/gccmakedep
-				app-text/rman )
-			virtual/x11 )"
+DEPEND="x11-misc/imake
+	x11-misc/gccmakedep
+	app-text/rman"
 RDEPEND=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-text/flpsed/ChangeLog b/app-text/flpsed/ChangeLog
index 0b960b6b299a..12f3a4a29d58 100644
--- a/app-text/flpsed/ChangeLog
+++ b/app-text/flpsed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/flpsed
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/ChangeLog,v 1.12 2007/03/12 23:51:17 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/ChangeLog,v 1.13 2007/07/22 10:14:31 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> flpsed-0.3.ebuild,
+  flpsed-0.3.2.ebuild, flpsed-0.3.4.ebuild, flpsed-0.3.5.ebuild,
+  flpsed-0.3.7.ebuild:
+  Remove virtual/x11 from dependencies.
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/app-text/flpsed/flpsed-0.3.2.ebuild b/app-text/flpsed/flpsed-0.3.2.ebuild
index a208cf84d56e..4ce33e201b09 100644
--- a/app-text/flpsed/flpsed-0.3.2.ebuild
+++ b/app-text/flpsed/flpsed-0.3.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/app-text/flpsed/flpsed-0.3.2.ebuild,v 1.3 2006/02/07 17:36:44 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.3.2.ebuild,v 1.4 2007/07/22 10:14:31 omp Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-			    x11-libs/libXext
-				x11-libs/libXft
-			  )
-			  virtual/x11
-			)"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	>=x11-libs/fltk-1.1
 	virtual/ghostscript"
diff --git a/app-text/flpsed/flpsed-0.3.4.ebuild b/app-text/flpsed/flpsed-0.3.4.ebuild
index 2a70c6bb43ef..1b27958422ca 100644
--- a/app-text/flpsed/flpsed-0.3.4.ebuild
+++ b/app-text/flpsed/flpsed-0.3.4.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/app-text/flpsed/flpsed-0.3.4.ebuild,v 1.2 2006/02/07 17:36:44 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.3.4.ebuild,v 1.3 2007/07/22 10:14:31 omp Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-			    x11-libs/libXext
-				x11-libs/libXft
-			  )
-			  virtual/x11
-			)"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	>=x11-libs/fltk-1.1
 	virtual/ghostscript"
diff --git a/app-text/flpsed/flpsed-0.3.5.ebuild b/app-text/flpsed/flpsed-0.3.5.ebuild
index 875894e90132..da7e64f7367d 100644
--- a/app-text/flpsed/flpsed-0.3.5.ebuild
+++ b/app-text/flpsed/flpsed-0.3.5.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/app-text/flpsed/flpsed-0.3.5.ebuild,v 1.3 2006/02/07 17:36:44 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.3.5.ebuild,v 1.4 2007/07/22 10:14:31 omp Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-			    x11-libs/libXext
-				x11-libs/libXft
-			  )
-			  virtual/x11
-			)"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	>=x11-libs/fltk-1.1
 	virtual/ghostscript"
diff --git a/app-text/flpsed/flpsed-0.3.7.ebuild b/app-text/flpsed/flpsed-0.3.7.ebuild
index 63d982f0fdbe..53f3d5535caa 100644
--- a/app-text/flpsed/flpsed-0.3.7.ebuild
+++ b/app-text/flpsed/flpsed-0.3.7.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/app-text/flpsed/flpsed-0.3.7.ebuild,v 1.3 2006/11/05 19:30:56 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.3.7.ebuild,v 1.4 2007/07/22 10:14:31 omp Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-			    x11-libs/libXext
-				x11-libs/libXft
-			  )
-			  virtual/x11
-			)"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	>=x11-libs/fltk-1.1
 	virtual/ghostscript"
diff --git a/app-text/flpsed/flpsed-0.3.ebuild b/app-text/flpsed/flpsed-0.3.ebuild
index 45f6a29220b1..842e9c350485 100644
--- a/app-text/flpsed/flpsed-0.3.ebuild
+++ b/app-text/flpsed/flpsed-0.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/app-text/flpsed/flpsed-0.3.ebuild,v 1.4 2006/02/07 17:36:44 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.3.ebuild,v 1.5 2007/07/22 10:14:31 omp Exp $
 
 inherit flag-o-matic
 
@@ -13,12 +13,9 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="|| ( ( x11-libs/libX11
-			    x11-libs/libXext
-				x11-libs/libXft
-			  )
-			  virtual/x11
-			)"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	>=x11-libs/fltk-1.1
 	virtual/ghostscript"
diff --git a/app-text/ghostscript-esp/ChangeLog b/app-text/ghostscript-esp/ChangeLog
index 541b0fcde67b..484db54f872f 100644
--- a/app-text/ghostscript-esp/ChangeLog
+++ b/app-text/ghostscript-esp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-esp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.53 2007/07/04 06:24:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.54 2007/07/22 10:17:18 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org>
+  ghostscript-esp-7.07.1-r8.ebuild:
+  Remove virtual/x11 from dependencies.
 
   04 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-esp-7.07.1-r8.ebuild, ghostscript-esp-8.15.3.ebuild,
diff --git a/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild b/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild
index c3537a001139..9778a00c13ff 100644
--- a/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild
+++ b/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.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/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild,v 1.14 2007/07/04 06:24:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ghostscript-esp-7.07.1-r8.ebuild,v 1.15 2007/07/22 10:17:18 omp Exp $
 
 inherit flag-o-matic eutils toolchain-funcs libtool
 
@@ -20,10 +20,8 @@ DEP="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
-	X? ( || ( (
-			x11-libs/libX11
-			x11-libs/libXt )
-		virtual/x11 ) )
+	X? ( x11-libs/libX11
+		x11-libs/libXt )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( net-print/cups )
 	!app-text/ghostscript-gnu
diff --git a/app-text/ghostscript-gnu/ChangeLog b/app-text/ghostscript-gnu/ChangeLog
index 2ab551f6cdc7..a58c0a073e63 100644
--- a/app-text/ghostscript-gnu/ChangeLog
+++ b/app-text/ghostscript-gnu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/ghostscript-gnu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.30 2007/07/04 06:36:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.31 2007/07/22 10:18:54 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> ghostscript-gnu-8.55.ebuild:
+  Remove virtual/x11 from dependencies.
 
   04 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-gnu-8.55.ebuild:
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild
index af32dd130d88..f03e499d144a 100644
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild
+++ b/app-text/ghostscript-gnu/ghostscript-gnu-8.55.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/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild,v 1.5 2007/07/04 06:36:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.55.ebuild,v 1.6 2007/07/22 10:18:54 omp Exp $
 
 WANT_AUTOMAKE=1.6
 inherit autotools elisp-common eutils versionator flag-o-matic
@@ -26,7 +26,7 @@ DEP="virtual/libc
 	>=media-libs/libpng-1.2.5
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7
-	X? ( || ( x11-libs/libXt virtual/x11 ) )
+	X? ( x11-libs/libXt )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
 	jpeg2k? ( media-libs/jasper )
diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog
index 159f4d33a392..56f57be5610c 100644
--- a/app-text/gv/ChangeLog
+++ b/app-text/gv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.67 2007/07/04 09:37:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.68 2007/07/22 10:21:01 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> gv-3.6.2-r1.ebuild,
+  gv-3.6.3.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *gv-3.6.3 (04 Jul 2007)
 
diff --git a/app-text/gv/gv-3.6.2-r1.ebuild b/app-text/gv/gv-3.6.2-r1.ebuild
index 9676f52e5943..a6c7d69d05f7 100644
--- a/app-text/gv/gv-3.6.2-r1.ebuild
+++ b/app-text/gv/gv-3.6.2-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/app-text/gv/gv-3.6.2-r1.ebuild,v 1.12 2007/04/07 17:30:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.2-r1.ebuild,v 1.13 2007/07/22 10:21:01 omp Exp $
 
 inherit eutils
 
@@ -24,12 +24,9 @@ RDEPEND="x11-libs/libICE
 	x11-libs/libXt
 	x11-libs/Xaw3d
 	virtual/ghostscript"
-
 DEPEND="${RDEPEND}
-	|| (
-		x11-libs/libXt
-		virtual/x11
-	)"
+	x11-libs/libXt"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/app-text/gv/gv-3.6.3.ebuild b/app-text/gv/gv-3.6.3.ebuild
index d728bea887e1..0b09b9fc3b98 100644
--- a/app-text/gv/gv-3.6.3.ebuild
+++ b/app-text/gv/gv-3.6.3.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/app-text/gv/gv-3.6.3.ebuild,v 1.1 2007/07/04 09:37:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.3.ebuild,v 1.2 2007/07/22 10:21:01 omp Exp $
 
 inherit eutils
 
@@ -22,12 +22,9 @@ RDEPEND="x11-libs/libICE
 	x11-libs/libXt
 	x11-libs/Xaw3d
 	virtual/ghostscript"
-
 DEPEND="${RDEPEND}
-	|| (
-		x11-libs/libXt
-		virtual/x11
-	)"
+	x11-libs/libXt"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/app-text/manedit/ChangeLog b/app-text/manedit/ChangeLog
index 5f991f35a3e6..a81a633f6940 100644
--- a/app-text/manedit/ChangeLog
+++ b/app-text/manedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/manedit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.30 2007/02/19 22:31:38 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.31 2007/07/22 10:22:14 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> manedit-0.7.1.ebuild,
+  manedit-0.8.1.ebuild:
+  Remove virtual/x11 from dependencies.
 
   19 Feb 2007; Paul Varner <fuzzyray@gentoo.org> ChangeLog:
   Fix broken manifest
diff --git a/app-text/manedit/manedit-0.7.1.ebuild b/app-text/manedit/manedit-0.7.1.ebuild
index 9b70cfa350b4..978bb5bac8f0 100644
--- a/app-text/manedit/manedit-0.7.1.ebuild
+++ b/app-text/manedit/manedit-0.7.1.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/app-text/manedit/manedit-0.7.1.ebuild,v 1.5 2007/01/30 05:13:03 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.7.1.ebuild,v 1.6 2007/07/22 10:22:14 omp Exp $
 
 DESCRIPTION="Man page editor using XML tags"
 HOMEPAGE="http://wolfpack.twu.net/ManEdit/"
@@ -14,10 +14,7 @@ IUSE=""
 RDEPEND="=x11-libs/gtk+-1*
 	sys-libs/zlib
 	app-arch/bzip2
-	|| ( ( x11-libs/libXi
-		)
-		virtual/x11
-	)"
+	x11-libs/libXi"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-text/manedit/manedit-0.8.1.ebuild b/app-text/manedit/manedit-0.8.1.ebuild
index ad8a2b315594..ed16d39e07bc 100644
--- a/app-text/manedit/manedit-0.8.1.ebuild
+++ b/app-text/manedit/manedit-0.8.1.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/app-text/manedit/manedit-0.8.1.ebuild,v 1.2 2007/02/19 22:30:29 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.8.1.ebuild,v 1.3 2007/07/22 10:22:14 omp Exp $
 
 inherit eutils
 
@@ -16,10 +16,7 @@ IUSE=""
 RDEPEND="=x11-libs/gtk+-1*
 	sys-libs/zlib
 	app-arch/bzip2
-	|| ( ( x11-libs/libXi
-		)
-		virtual/x11
-	)"
+	x11-libs/libXi"
 
 DEPEND="${RDEPEND}"
 
diff --git a/app-text/pspresent/ChangeLog b/app-text/pspresent/ChangeLog
index 8652db0defb0..3f6696790a2b 100644
--- a/app-text/pspresent/ChangeLog
+++ b/app-text/pspresent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pspresent
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.21 2007/03/09 21:04:10 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.22 2007/07/22 10:24:50 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> pspresent-1.2.ebuild,
+  pspresent-1.2-r1.ebuild, pspresent-1.3.ebuild:
+  Remove virtual/x11 from dependencies.
 
 *pspresent-1.3 (05 Mar 2007)
 
diff --git a/app-text/pspresent/pspresent-1.2-r1.ebuild b/app-text/pspresent/pspresent-1.2-r1.ebuild
index e843911608ce..ba0a11e795d1 100644
--- a/app-text/pspresent/pspresent-1.2-r1.ebuild
+++ b/app-text/pspresent/pspresent-1.2-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/app-text/pspresent/pspresent-1.2-r1.ebuild,v 1.2 2006/04/21 16:14:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2-r1.ebuild,v 1.3 2007/07/22 10:24:50 omp Exp $
 
 IUSE="xinerama"
 
@@ -9,14 +9,12 @@ SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
 HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libX11
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
 	virtual/ghostscript"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/app-text/pspresent/pspresent-1.2.ebuild b/app-text/pspresent/pspresent-1.2.ebuild
index cf7fc301aa9e..dcfd12736d60 100644
--- a/app-text/pspresent/pspresent-1.2.ebuild
+++ b/app-text/pspresent/pspresent-1.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/app-text/pspresent/pspresent-1.2.ebuild,v 1.9 2007/03/05 20:27:40 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2.ebuild,v 1.10 2007/07/22 10:24:50 omp Exp $
 
 IUSE="xinerama"
 
@@ -9,14 +9,12 @@ SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
 HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libX11
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
 	virtual/ghostscript"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/app-text/pspresent/pspresent-1.3.ebuild b/app-text/pspresent/pspresent-1.3.ebuild
index 4b525a6c3bbb..7b48f8557daf 100644
--- a/app-text/pspresent/pspresent-1.3.ebuild
+++ b/app-text/pspresent/pspresent-1.3.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/app-text/pspresent/pspresent-1.3.ebuild,v 1.1 2007/03/05 20:27:40 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.3.ebuild,v 1.2 2007/07/22 10:24:50 omp Exp $
 
 IUSE="xinerama"
 
@@ -9,14 +9,12 @@ SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
 HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
 
 RDEPEND="virtual/libc
-	|| ( ( x11-libs/libX11
-			xinerama? ( x11-libs/libXinerama ) )
-		virtual/x11 )
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
 	virtual/ghostscript"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
 	>=sys-apps/sed-4"
 
 SLOT="0"