Drop virtual/x11 dependency.

Package-Manager: portage-2.1.3_rc8

6 files changed, 30 insertions, 38 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 09d0c27a63c8..e503455d746c 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/magicpoint
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.23 2007/06/30 08:31:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.24 2007/07/22 09:58:40 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> magicpoint-1.11b.ebuild:
+  Drop virtual/x11 dependency.
 
   30 Jun 2007; Ulrich Mueller <ulm@gentoo.org> magicpoint-1.11b.ebuild:
   Fix conditional for calling elisp-site-regen, bug #182639.
diff --git a/app-office/magicpoint/magicpoint-1.11b.ebuild b/app-office/magicpoint/magicpoint-1.11b.ebuild
index f576285dedb2..51b46c5dc6bd 100644
--- a/app-office/magicpoint/magicpoint-1.11b.ebuild
+++ b/app-office/magicpoint/magicpoint-1.11b.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-office/magicpoint/magicpoint-1.11b.ebuild,v 1.14 2007/06/30 08:31:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.15 2007/07/22 09:58:40 calchan Exp $
 
 inherit elisp-common eutils fixheadtails
 
@@ -14,13 +14,10 @@ SLOT="0"
 KEYWORDS="x86 alpha sparc ppc amd64"
 IUSE="cjk nls m17n-lib emacs truetype gif imlib mng"
 
-MY_DEPEND="|| ( ( x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXrender
-			x11-libs/libXmu
-		)
-		virtual/x11
-	)
+MY_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXrender
+	x11-libs/libXmu
 	gif? ( >=media-libs/giflib-4.0.1 )
 	imlib? ( media-libs/imlib )
 	truetype? ( virtual/xft )
@@ -29,13 +26,10 @@ MY_DEPEND="|| ( ( x11-libs/libICE
 	mng? ( media-libs/libmng )"
 DEPEND="${MY_DEPEND}
 	sys-devel/autoconf
-	|| ( ( x11-proto/xextproto
-			x11-libs/libxkbfile
-			app-text/rman
-			x11-misc/imake
-		)
-		virtual/x11
-	)"
+	x11-proto/xextproto
+	x11-libs/libxkbfile
+	app-text/rman
+	x11-misc/imake"
 RDEPEND="${MY_DEPEND}
 	nls? ( sys-devel/gettext )
 	truetype? ( cjk? ( media-fonts/sazanami ) )"
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index b3845ff762fc..b890411d53a7 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.56 2007/03/12 23:41:55 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.57 2007/07/22 10:02:33 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> texmacs-1.0.4-r1.ebuild,
+  texmacs-1.0.5.6.ebuild, texmacs-1.0.6-r1.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-office/texmacs/texmacs-1.0.4-r1.ebuild b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
index 6498c5406b75..f29e63b355ea 100644
--- a/app-office/texmacs/texmacs-1.0.4-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4-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-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.9 2007/07/13 07:04:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.10 2007/07/22 10:02:33 calchan Exp $
 
 inherit flag-o-matic
 
@@ -22,16 +22,13 @@ RDEPEND="virtual/tetex
 	>=dev-scheme/guile-1.4
 	>=sys-apps/sed-4
 	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-	    virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libICE
 	media-libs/imlib2
 	spell? ( >=app-text/ispell-3.2 )"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-		 virtual/x11 )
+	x11-proto/xproto
 	virtual/ghostscript"
 
 src_compile() {
diff --git a/app-office/texmacs/texmacs-1.0.5.6.ebuild b/app-office/texmacs/texmacs-1.0.5.6.ebuild
index 92081651a9c0..e88360aa97b7 100644
--- a/app-office/texmacs/texmacs-1.0.5.6.ebuild
+++ b/app-office/texmacs/texmacs-1.0.5.6.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-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.6 2007/07/13 07:04:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.7 2007/07/22 10:02:33 calchan Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
@@ -23,16 +23,13 @@ RDEPEND="virtual/tetex
 	>=dev-scheme/guile-1.4
 	>=sys-apps/sed-4
 	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libICE
 	media-libs/imlib2
 	spell? ( >=app-text/ispell-3.2 )"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-	     virtual/x11 )
+	x11-proto/xproto
 	virtual/ghostscript"
 
 src_compile() {
diff --git a/app-office/texmacs/texmacs-1.0.6-r1.ebuild b/app-office/texmacs/texmacs-1.0.6-r1.ebuild
index c7c7d4a46afd..c26bc45c6bf7 100644
--- a/app-office/texmacs/texmacs-1.0.6-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.6-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-office/texmacs/texmacs-1.0.6-r1.ebuild,v 1.10 2007/07/13 07:04:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6-r1.ebuild,v 1.11 2007/07/22 10:02:33 calchan Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic eutils
@@ -23,16 +23,13 @@ RDEPEND="virtual/tetex
 	>=dev-scheme/guile-1.4
 	>=sys-apps/sed-4
 	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libICE
 	media-libs/imlib2
 	spell? ( >=app-text/ispell-3.2 )"
 
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-	     virtual/x11 )
+	x11-proto/xproto
 	virtual/ghostscript"
 
 src_unpack() {