Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

5 files changed, 20 insertions, 27 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 9c23ebe44aac..4784e8f3cd24 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.127 2007/03/05 14:02:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.128 2007/07/22 08:49:26 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  mjpegtools-1.8.0-r1.ebuild, mjpegtools-1.8.0-r2.ebuild,
+  mjpegtools-1.9.0_rc1.ebuild, mjpegtools-1.9.0_rc2.ebuild:
+  Drop virtual/x11 references.
 
 *mjpegtools-1.9.0_rc2 (05 Mar 2007)
 
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 26c9eee56c85..53bd218b6c8b 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-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/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.24 2006/11/20 13:02:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.25 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -23,11 +23,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
index 26587cce921e..082b8aeec977 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-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/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.2 2006/11/20 13:02:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.3 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -23,11 +23,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild
index deb2a84ee249..5556a23d298d 100644
--- a/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.9.0_rc1.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-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild,v 1.1 2007/02/25 22:43:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc1.ebuild,v 1.2 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -25,11 +25,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild
index 1f48081a73d5..8824ea494ae2 100644
--- a/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.9.0_rc2.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-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild,v 1.1 2007/03/05 14:02:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0_rc2.ebuild,v 1.2 2007/07/22 08:49:26 dberkholz Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -24,11 +24,8 @@ RDEPEND="media-libs/jpeg
 	quicktime? ( virtual/quicktime )
 	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libXt
-			)
-			virtual/x11
-		)
+	X? ( x11-libs/libX11
+		x11-libs/libXt
 	)"
 
 DEPEND="${RDEPEND}