Change x11-base/xfree dependency to virtual/x11.

16 files changed, 43 insertions, 30 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 09277101f393..2caff8dbaa2f 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.54 2004/03/19 08:48:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.55 2004/03/30 04:44:11 spyderous Exp $
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mjpegtools-1.6.0-r7.ebuild, mjpegtools-1.6.1.90-r1.ebuild,
+  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.1.91.ebuild,
+  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,
+  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2-r1.ebuild,
+  mjpegtools-1.6.2.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
 
   18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
   mjpegtools-1.6.2-r1.ebuild:
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
index fa7d8738cf20..c0822c2cb47f 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.19 2004/01/17 04:43:31 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.20 2004/03/30 04:44:11 spyderous Exp $
 
 inherit eutils gcc libtool flag-o-matic base
 
@@ -24,7 +24,7 @@ IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi svga"
 RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	=x11-libs/gtk+-1.2*
-	X? ( x11-base/xfree )
+	X? ( virtual/x11 )
 	sdl? ( media-libs/libsdl )
 	media-libs/libdv
 	arts? ( kde-base/arts )"
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
index 73bb817e61f3..96e53424a35a 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild,v 1.7 2004/02/24 19:53:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild,v 1.8 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc
 
@@ -25,7 +25,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
index 63f2e88c34f9..b3321aa39998 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.2 2004/03/17 13:55:50 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.3 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc
 
@@ -25,7 +25,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild
index 96f0bf9178b6..9735c2dc8d97 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild,v 1.5 2004/02/24 19:53:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild,v 1.6 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc
 
@@ -27,7 +27,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
index 90c302c796be..a775c8aca7bf 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild,v 1.2 2004/02/24 19:53:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild,v 1.3 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc
 
@@ -27,7 +27,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild
index db3a4ef86d22..58e4fe70fb16 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild,v 1.2 2004/03/17 16:46:15 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild,v 1.3 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc
 
@@ -27,7 +27,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
index 7721b4b934ab..c64d244f73cb 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.ebuild,v 1.11 2004/02/24 19:53:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.ebuild,v 1.12 2004/03/30 04:44:11 spyderous Exp $
 
 inherit gcc libtool flag-o-matic base
 
@@ -17,7 +17,7 @@ IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
 RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	gtk? ( =x11-libs/gtk+-1.2* )
-	X? ( x11-base/xfree )
+	X? ( virtual/x11 )
 	sdl? ( media-libs/libsdl )
 	media-libs/libdv
 	arts? ( kde-base/arts )"
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
index 128f00b96da9..301d58f558e1 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.3 2004/03/18 09:21:54 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.4 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -27,7 +27,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2.ebuild
index 743cb11fcf6c..e3e100c17657 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2.ebuild,v 1.4 2004/02/21 23:15:23 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2.ebuild,v 1.5 2004/03/30 04:44:11 spyderous Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -26,7 +26,7 @@ DEPEND="media-libs/jpeg
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( media-libs/libsdl )
-	X? ( x11-base/xfree )"
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c36225f81ec7..ff2a51d1d97e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.114 2004/03/23 16:27:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.115 2004/03/30 04:42:22 spyderous Exp $
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mplayer-0.92.ebuild,
+  mplayer-1.0_pre2.ebuild, mplayer-1.0_pre3-r1.ebuild,
+  mplayer-1.0_pre3-r2.ebuild, mplayer-1.0_pre3.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
 
   23 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r2.ebuild,
   files/mplayer-1.0_pre3-xmms.patch:
diff --git a/media-video/mplayer/mplayer-0.92.ebuild b/media-video/mplayer/mplayer-0.92.ebuild
index 5261521523fd..f58d1d4082e6 100644
--- a/media-video/mplayer/mplayer-0.92.ebuild
+++ b/media-video/mplayer/mplayer-0.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.12 2004/03/16 04:39:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.13 2004/03/30 04:42:22 spyderous Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc"
 
@@ -28,7 +28,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 			>=media-libs/divx4linux-20020418
 			>=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
-			>=x11-base/xfree-4.2.1-r2
+			virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2*
 				=dev-libs/glib-1.2* )
 		gtk2? ( >=x11-libs/gtk+-2.0.6
diff --git a/media-video/mplayer/mplayer-1.0_pre2.ebuild b/media-video/mplayer/mplayer-1.0_pre2.ebuild
index 2f0321be286c..8763c1657e38 100644
--- a/media-video/mplayer/mplayer-1.0_pre2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.16 2004/02/24 09:44:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.17 2004/03/30 04:42:22 spyderous Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick"
 
@@ -29,7 +29,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2
+	       virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
 		gtk2? ( >=x11-libs/gtk+-2.0.6
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
index 2b1af7740151..24f7f84aaeb0 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild,v 1.2 2004/03/17 22:39:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild,v 1.3 2004/03/30 04:42:22 spyderous Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick"
 
@@ -29,7 +29,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2
+	       virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
 		gtk2? ( >=x11-libs/gtk+-2.0.6
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
index 0092d71417be..cea8badec021 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild,v 1.5 2004/03/23 16:27:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild,v 1.6 2004/03/30 04:42:22 spyderous Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick theora"
 
@@ -29,7 +29,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2
+	       virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
 		gtk2? ( >=x11-libs/gtk+-2.0.6
diff --git a/media-video/mplayer/mplayer-1.0_pre3.ebuild b/media-video/mplayer/mplayer-1.0_pre3.ebuild
index 21a45de74dce..fcc7175a1853 100644
--- a/media-video/mplayer/mplayer-1.0_pre3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3.ebuild,v 1.13 2004/03/16 23:28:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3.ebuild,v 1.14 2004/03/30 04:42:22 spyderous Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick"
 
@@ -29,7 +29,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	       >=media-libs/divx4linux-20030428
 	       >=media-libs/win32codecs-0.60 )
 	gtk? ( media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2
+	       virtual/x11
 		!gtk2? ( =x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
 		gtk2? ( >=x11-libs/gtk+-2.0.6