[patch] Patch to allow xorg-6.8

mplayer-depend.diff (text/plain), 2.44 KB, created by Jon Severinsson on 2006-08-11 08:12:21 UTC

--- /usr/portage/media-video/mplayer/mplayer-1.0_pre20060810.ebuild	2006-08-11 00:06:06.000000000 +0200
+++ mplayer-1.0_pre20060810.ebuild	2006-08-11 16:40:26.000000000 +0200
@@ -44,7 +44,7 @@
 	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,10 +58,11 @@
 	enca? ( app-i18n/enca )
 	gif? ( media-libs/giflib )
 	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		   x11-libs/libXxf86vm
-		   x11-libs/libXext
-		   x11-libs/libXi
+	gtk? ( || ( ( x11-libs/libXxf86vm
+				  x11-libs/libXext
+				  x11-libs/libXi )
+			    <virtual/x11-7 )
+		   media-libs/libpng
 		   =x11-libs/gtk+-2*
 		   =dev-libs/glib-2* )
 	jpeg? ( media-libs/jpeg )
@@ -81,17 +82,20 @@
 	live? ( >=media-plugins/live-2004.07.20 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( x11-libs/libXinerama
-				x11-libs/libXxf86vm
-				x11-libs/libXext )
+				|| ( ( x11-libs/libXxf86vm
+					   x11-libs/libXext )
+					 <virtual/x11-7 ) )
 	xmms? ( media-sound/xmms )
 	xanim? ( >=media-video/xanim-2.80.1-r4 )
 	sys-libs/ncurses
-	xv? ( x11-libs/libXv
-		  x11-libs/libXxf86vm
-		  x11-libs/libXext
-		  xvmc? ( x11-libs/libXvMC ) )
-	X? ( x11-libs/libXxf86vm
-		 x11-libs/libXext )
+	xv? ( || ( ( x11-libs/libXv
+				 x11-libs/libXxf86vm
+				 x11-libs/libXext
+				 xvmc? ( x11-libs/libXvMC ) )
+			   <virtual/x11-7 ) )
+	X? ( || ( ( x11-libs/libXxf86vm
+				x11-libs/libXext )
+			  <virtual/x11-7 ) )
 	"
 
 DEPEND="${RDEPEND}
@@ -101,14 +105,17 @@
 		   >=app-text/docbook-xml-simple-dtd-1.50.0
 		   dev-libs/libxslt
 		   )
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
+	dga? ( || ( x11-proto/xf86dgaproto <virtual/x11-7 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
+	xv? ( || ( ( x11-proto/videoproto
+				 x11-proto/xf86vidmodeproto )
+			   <virtual/x11-7 ) )
+	gtk? ( || ( ( x11-proto/xextproto
+		   		  x11-proto/xf86vidmodeproto )
+		   		<virtual/x11-7 ) )
+	X? ( || ( ( x11-proto/xextproto
+				x11-proto/xf86vidmodeproto )
+			  <virtual/x11-7 ) )
 	iconv? ( virtual/libiconv )"
 
 SLOT="0"