Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

4 files changed, 28 insertions, 18 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 01ba3b4b7bdf..be7a5d337d15 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/spim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.42 2007/01/30 05:28:51 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.43 2007/07/22 09:32:36 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> spim-7.2.1-r2.ebuild,
+  spim-7.2.1-r3.ebuild, spim-7.3.ebuild:
+  Remove virtual/x11 from dependencies.
 
   30 Jan 2007; Steve Dibb <beandog@gentoo.org> spim-7.3.ebuild:
   amd64 stable, bug 158402, added strip to restrict
diff --git a/app-emulation/spim/spim-7.2.1-r2.ebuild b/app-emulation/spim/spim-7.2.1-r2.ebuild
index fbca0bb966f5..4deaa3df9d66 100644
--- a/app-emulation/spim/spim-7.2.1-r2.ebuild
+++ b/app-emulation/spim/spim-7.2.1-r2.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-emulation/spim/spim-7.2.1-r2.ebuild,v 1.3 2006/08/27 21:37:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.2.1-r2.ebuild,v 1.4 2007/07/22 09:32:36 omp Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,11 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc-macos ~sparc ~x86"
 IUSE="X"
 
-RDEPEND="X? ( || ( ( x11-libs/libXaw x11-libs/libXp ) virtual/x11 ) )"
+RDEPEND="X? ( x11-libs/libXaw
+		x11-libs/libXp )"
 DEPEND="${RDEPEND}
-		X? ( || ( ( x11-misc/imake x11-proto/xproto ) virtual/x11 ) )
-		>=sys-apps/sed-4
-		sys-devel/bison"
+	X? ( x11-misc/imake
+		x11-proto/xproto )
+	>=sys-apps/sed-4
+	sys-devel/bison"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emulation/spim/spim-7.2.1-r3.ebuild b/app-emulation/spim/spim-7.2.1-r3.ebuild
index 7584fb908045..b78e194e394a 100644
--- a/app-emulation/spim/spim-7.2.1-r3.ebuild
+++ b/app-emulation/spim/spim-7.2.1-r3.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-emulation/spim/spim-7.2.1-r3.ebuild,v 1.4 2006/10/10 00:50:09 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.2.1-r3.ebuild,v 1.5 2007/07/22 09:32:36 omp Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,11 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc-macos ~sparc x86"
 IUSE="X"
 
-RDEPEND="X? ( || ( ( x11-libs/libXaw x11-libs/libXp ) virtual/x11 ) )"
+RDEPEND="X? ( x11-libs/libXaw
+		x11-libs/libXp )"
 DEPEND="${RDEPEND}
-		X? ( || ( ( x11-misc/imake x11-proto/xproto ) virtual/x11 ) )
-		>=sys-apps/sed-4
-		sys-devel/bison"
+	X? ( x11-misc/imake
+		x11-proto/xproto )
+	>=sys-apps/sed-4
+	sys-devel/bison"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emulation/spim/spim-7.3.ebuild b/app-emulation/spim/spim-7.3.ebuild
index 7a222f629504..effed1c73f23 100644
--- a/app-emulation/spim/spim-7.3.ebuild
+++ b/app-emulation/spim/spim-7.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-emulation/spim/spim-7.3.ebuild,v 1.5 2007/01/30 05:28:51 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.3.ebuild,v 1.6 2007/07/22 09:32:36 omp Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,11 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc-macos ~sparc x86"
 IUSE="X"
 RESTRICT="strip"
-RDEPEND="X? ( || ( ( x11-libs/libXaw x11-libs/libXp ) virtual/x11 ) )"
+RDEPEND="X? ( x11-libs/libXaw
+		x11-libs/libXp )"
 DEPEND="${RDEPEND}
-		X? ( || ( ( x11-misc/imake x11-proto/xproto ) virtual/x11 ) )
-		>=sys-apps/sed-4
-		sys-devel/bison"
+	X? ( x11-misc/imake
+		x11-proto/xproto )
+	>=sys-apps/sed-4
+	sys-devel/bison"
 
 src_unpack() {
 	unpack ${A}