Pinpoint virtual/x11 version to less than 7.

(Portage version: 2.1.1_pre2-r6)

9 files changed, 96 insertions, 89 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 01bdc9ad262f..7da83c46a715 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.395 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.396 2006/07/09 21:03:24 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  mplayer-1.0_pre7-r1.ebuild, mplayer-1.0_pre8.ebuild,
+  mplayer-1.0.20060102.ebuild, mplayer-1.0.20060217.ebuild,
+  mplayer-1.0.20060302.ebuild, mplayer-1.0.20060408.ebuild,
+  mplayer-1.0.20060415.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   03 Jul 2006; Thomas Cort <tcort@gentoo.org> mplayer-1.0.20060102.ebuild,
   mplayer-1.0.20060217.ebuild, mplayer-1.0.20060302.ebuild,
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1
index 10d28c82b000..a80623262647 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1
@@ -1,9 +1,9 @@
 MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
 RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
 SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 aaca4fd327176c1afb463f0f047ef6f4 MPlayer-1.0pre7try2.tar.bz2 6868786
-RMD160 d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54 MPlayer-1.0pre7try2.tar.bz2 6868786
-SHA256 006da26e16bd1b1a8aec5d59b72b0b2ae7716f4e7634859a3e88b6fbbec4d89a MPlayer-1.0pre7try2.tar.bz2 6868786
+MD5 91d018c0e02cccd0c742a8a0b0a46652 MPlayer-1.0pre7try2.tar.bz2 824835
+RMD160 d0ecb186bb1c5fa1a840f1205db720a8cc0a5507 MPlayer-1.0pre7try2.tar.bz2 824835
+SHA256 7c819aee38507f94d96396a943a250fed8234384fbfb991ee78d10bc057defcb MPlayer-1.0pre7try2.tar.bz2 824835
 MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
diff --git a/media-video/mplayer/mplayer-1.0.20060102.ebuild b/media-video/mplayer/mplayer-1.0.20060102.ebuild
index f1444df866af..289a53cefdce 100644
--- a/media-video/mplayer/mplayer-1.0.20060102.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060102.ebuild,v 1.10 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060102.ebuild,v 1.11 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,7 +36,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	arts? ( kde-base/arts )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -54,7 +54,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -80,7 +80,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -90,38 +90,38 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0.20060217.ebuild b/media-video/mplayer/mplayer-1.0.20060217.ebuild
index 02e5c3f1838a..b20c846dd0dc 100644
--- a/media-video/mplayer/mplayer-1.0.20060217.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060217.ebuild,v 1.18 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060217.ebuild,v 1.19 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,7 +36,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	arts? ( kde-base/arts )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -54,7 +54,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -79,7 +79,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -89,38 +89,38 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0.20060302.ebuild b/media-video/mplayer/mplayer-1.0.20060302.ebuild
index 985eebe6be54..e01028862798 100644
--- a/media-video/mplayer/mplayer-1.0.20060302.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060302.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060302.ebuild,v 1.11 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060302.ebuild,v 1.12 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,7 +37,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -56,7 +56,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -81,7 +81,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -91,14 +91,14 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
@@ -110,24 +110,24 @@ DEPEND="${RDEPEND}
 		   dev-libs/libxslt
 		   )
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0.20060408.ebuild b/media-video/mplayer/mplayer-1.0.20060408.ebuild
index a0fb3b35d733..3db5df1f0260 100644
--- a/media-video/mplayer/mplayer-1.0.20060408.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060408.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060408.ebuild,v 1.9 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060408.ebuild,v 1.10 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,7 +37,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -56,7 +56,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -81,7 +81,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -91,14 +91,14 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
@@ -110,24 +110,24 @@ DEPEND="${RDEPEND}
 		   dev-libs/libxslt
 		   )
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0.20060415.ebuild b/media-video/mplayer/mplayer-1.0.20060415.ebuild
index 9469d276aa4b..34af86c26db5 100644
--- a/media-video/mplayer/mplayer-1.0.20060415.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060415.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060415.ebuild,v 1.19 2006/07/03 18:41:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060415.ebuild,v 1.20 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,7 +37,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -56,7 +56,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -82,7 +82,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -92,14 +92,14 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
@@ -111,24 +111,24 @@ DEPEND="${RDEPEND}
 		   dev-libs/libxslt
 		   )
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index ab4ae0d5db14..cd363bb28e8a 100644
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.18 2006/02/15 15:54:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.19 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,7 +39,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	arts? ( kde-base/arts )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvd? ( dvdread? ( media-libs/libdvdread ) )
@@ -56,7 +56,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2*
@@ -81,7 +81,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	jack? ( >=media-libs/bio2jack-0.4 )
@@ -92,38 +92,38 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	nls? ( sys-devel/gettext )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
diff --git a/media-video/mplayer/mplayer-1.0_pre8.ebuild b/media-video/mplayer/mplayer-1.0_pre8.ebuild
index b2946574de47..96c6ce46864d 100644
--- a/media-video/mplayer/mplayer-1.0_pre8.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.15 2006/06/28 04:20:08 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.16 2006/07/09 21:03:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,7 +39,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( || ( x11-libs/libXxf86dga <virtual/x11-7 ) )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -58,7 +58,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXext
 				x11-libs/libXi
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
@@ -83,7 +83,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	xmms? ( media-sound/xmms )
@@ -93,14 +93,14 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 				x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+	xvmc? ( || ( x11-libs/libXvMC <virtual/x11-7 ) )
 	X? ( || ( ( x11-libs/libXxf86vm
 				x11-libs/libXext
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)"
 
@@ -111,24 +111,24 @@ DEPEND="${RDEPEND}
 		   >=app-text/docbook-xml-simple-dtd-1.50.0
 		   dev-libs/libxslt
 		   )
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	xv? ( || ( ( x11-proto/videoproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	gtk? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	X? ( || ( ( x11-proto/xextproto
 				x11-proto/xf86vidmodeproto
 			)
-			virtual/x11
+			<virtual/x11-7
 		)
 	)
 	unicode? ( virtual/libiconv )"
@@ -367,7 +367,7 @@ src_compile() {
 	then
 		myconf="${myconf} --enable-svga"
 	else
-		myconf="${myconf} --disable-svga --disable-internal-vidix"
+		myconf="${myconf} --disable-svga" # --disable-internal-vidix"
 	fi
 
 	myconf="${myconf} $(use_enable tga)"