Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

4 files changed, 26 insertions, 19 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 32a8c86e6b87..f7b0492c1a28 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.39 2007/06/25 18:41:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.40 2007/07/22 09:54:09 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fbida-2.03-r4.ebuild,
+  fbida-2.05.ebuild, fbida-2.06.ebuild:
+  Drop virtual/x11 references.
 
   25 Jun 2007; Raúl Porcel <armin76@gentoo.org> fbida-2.05.ebuild:
   alpha stable wrt #177324
diff --git a/media-gfx/fbida/fbida-2.03-r4.ebuild b/media-gfx/fbida/fbida-2.03-r4.ebuild
index bcf28c490446..d7de46c0d4f9 100644
--- a/media-gfx/fbida/fbida-2.03-r4.ebuild
+++ b/media-gfx/fbida/fbida-2.03-r4.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/media-gfx/fbida/fbida-2.03-r4.ebuild,v 1.4 2007/04/22 14:38:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r4.ebuild,v 1.5 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/fbida/fbida-2.05.ebuild b/media-gfx/fbida/fbida-2.05.ebuild
index 204af46796df..c09cc3121eab 100644
--- a/media-gfx/fbida/fbida-2.05.ebuild
+++ b/media-gfx/fbida/fbida-2.05.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/media-gfx/fbida/fbida-2.05.ebuild,v 1.14 2007/06/25 18:41:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.05.ebuild,v 1.15 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/fbida/fbida-2.06.ebuild b/media-gfx/fbida/fbida-2.06.ebuild
index 65cd11e1de6b..18f719b7f8aa 100644
--- a/media-gfx/fbida/fbida-2.06.ebuild
+++ b/media-gfx/fbida/fbida-2.06.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/media-gfx/fbida/fbida-2.06.ebuild,v 1.2 2007/05/06 13:29:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.06.ebuild,v 1.3 2007/07/22 09:54:09 dberkholz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,9 +20,11 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
-			virtual/x11 )
-		virtual/motif )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		virtual/motif
+	)
 	!media-gfx/fbi
 	media-libs/libexif
 	>=media-libs/freetype-2.0
@@ -30,8 +32,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-fonts/ttf-bitstream-vera"
 
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-			virtual/x11 ) )"
+	X? ( x11-proto/xextproto x11-proto/xproto )"
 
 src_unpack() {
 	unpack ${A}