Drop virtual/x11 dependency.

Package-Manager: portage-2.1.3_rc8

8 files changed, 35 insertions, 39 deletions

diff --git a/app-text/texlive/ChangeLog b/app-text/texlive/ChangeLog
index 15bac5a737ce..e408cb0ea6fe 100644
--- a/app-text/texlive/ChangeLog
+++ b/app-text/texlive/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/texlive
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.5 2007/03/13 00:04:47 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/ChangeLog,v 1.6 2007/07/22 10:27:06 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> texlive-2005.ebuild:
+  Drop virtual/x11 dependency.
 
   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/texlive/texlive-2005.ebuild b/app-text/texlive/texlive-2005.ebuild
index e1b52797bf80..a8b5629be0fc 100644
--- a/app-text/texlive/texlive-2005.ebuild
+++ b/app-text/texlive/texlive-2005.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/texlive/texlive-2005.ebuild,v 1.4 2007/01/28 06:10:10 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2005.ebuild,v 1.5 2007/07/22 10:27:06 calchan Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
@@ -37,18 +37,13 @@ BLOCKS="!dev-tex/memoir
 	!dev-tex/eurosym
 	!dev-tex/extsizes"
 
-MODULAR_X_DEPEND="X? ( || ( (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXaw
-				x11-libs/libXfont
-			)
-			virtual/x11
-		)
-	)"
+MODULAR_X_DEPEND="X? ( x11-libs/libXmu
+			x11-libs/libXp
+			x11-libs/libXpm
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXaw
+			x11-libs/libXfont )"
 
 DEPEND="${MODULAR_X_DEPEND}
 	!app-text/ptex
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index e321d9325e9f..a5acfc87aeaf 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.38 2007/04/22 10:55:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.39 2007/07/22 10:24:39 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> xdvik-22.40y-r2.ebuild,
+  xdvik-22.84.5.ebuild:
+  Drop virtual/x11 dependency.
 
   22 Apr 2007; Markus Rothe <corsair@gentoo.org> xdvik-22.84.10.ebuild:
   Stable on ppc64
diff --git a/app-text/xdvik/xdvik-22.40y-r2.ebuild b/app-text/xdvik/xdvik-22.40y-r2.ebuild
index 50f7d4364d10..e2e3c34c44f0 100644
--- a/app-text/xdvik/xdvik-22.40y-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.40y-r2.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/xdvik/xdvik-22.40y-r2.ebuild,v 1.16 2007/03/13 00:18:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.17 2007/07/22 10:24:39 calchan Exp $
 
 inherit eutils
 
@@ -20,13 +20,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-1.3
-	|| (
-		(
-			x11-libs/libXpm
-			x11-libs/libXmu
-		)
-		virtual/x11
-	)
+	x11-libs/libXpm
+	x11-libs/libXmu
 	virtual/tetex
 	cjk? ( >=media-libs/freetype-2 )
 	libwww? ( >=net-libs/libwww-5.3.2-r1 )
diff --git a/app-text/xdvik/xdvik-22.84.5.ebuild b/app-text/xdvik/xdvik-22.84.5.ebuild
index c0f96d402319..378ecc995fe7 100644
--- a/app-text/xdvik/xdvik-22.84.5.ebuild
+++ b/app-text/xdvik/xdvik-22.84.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/xdvik/xdvik-22.84.5.ebuild,v 1.4 2006/11/06 16:23:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.5.ebuild,v 1.5 2007/07/22 10:24:39 calchan Exp $
 
 inherit eutils flag-o-matic elisp-common
 
@@ -19,13 +19,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-5.0.2
-	|| (
-		(
-			x11-libs/libXmu
-			x11-libs/libXpm
-		)
-		virtual/x11
-	)
+	x11-libs/libXmu
+	x11-libs/libXpm
 	motif? ( lesstif? ( x11-libs/lesstif )
 		!lesstif? ( x11-libs/openmotif ) )
 	!motif? ( neXt? ( x11-libs/neXtaw )
diff --git a/app-text/yudit/ChangeLog b/app-text/yudit/ChangeLog
index 838085f16ebf..110252cfd293 100644
--- a/app-text/yudit/ChangeLog
+++ b/app-text/yudit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/yudit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yudit/ChangeLog,v 1.21 2007/01/06 01:09:53 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yudit/ChangeLog,v 1.22 2007/07/22 10:20:20 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> yudit-2.8.1_beta7.ebuild,
+  yudit-2.8.1.ebuild:
+  Drop virtual/x11 dependency.
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -yudit-2.7.6.ebuild,
   -yudit-2.7.8.ebuild:
diff --git a/app-text/yudit/yudit-2.8.1.ebuild b/app-text/yudit/yudit-2.8.1.ebuild
index 3217b1cb09ee..9f8a1003eac7 100644
--- a/app-text/yudit/yudit-2.8.1.ebuild
+++ b/app-text/yudit/yudit-2.8.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/app-text/yudit/yudit-2.8.1.ebuild,v 1.1 2006/12/17 14:10:20 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yudit/yudit-2.8.1.ebuild,v 1.2 2007/07/22 10:20:20 calchan Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+DEPEND="x11-libs/libX11
 	>=sys-devel/gettext-0.10"
 
 src_unpack() {
diff --git a/app-text/yudit/yudit-2.8.1_beta7.ebuild b/app-text/yudit/yudit-2.8.1_beta7.ebuild
index 5abdd0b4e9fe..912979b2abd7 100644
--- a/app-text/yudit/yudit-2.8.1_beta7.ebuild
+++ b/app-text/yudit/yudit-2.8.1_beta7.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/yudit/yudit-2.8.1_beta7.ebuild,v 1.3 2006/11/07 21:55:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yudit/yudit-2.8.1_beta7.ebuild,v 1.4 2007/07/22 10:20:20 calchan Exp $
 
 inherit versionator
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 sparc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )
+DEPEND="x11-libs/libX11
 	>=sys-devel/gettext-0.10"
 
 src_compile() {