Depend on series 6 of virtual/x11 so to not screw up stable users with modular setup.

(Portage version: 2.1.1_pre2-r4)

5 files changed, 41 insertions, 34 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 36c971088fcf..6c953f8ba3fc 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.374 2006/07/07 13:12:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.375 2006/07/07 13:17:29 flameeyes Exp $
+
+  07 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.1-r3.ebuild, xine-lib-1.1.2_pre20060328-r9.ebuild,
+  xine-lib-1.1.2_pre20060328-r11.ebuild,
+  xine-lib-1.1.2_pre20060630-r1.ebuild:
+  Depend on series 6 of virtual/x11 so to not screw up stable users with
+  modular setup.
 
   07 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   xine-lib-1.1.1-r3.ebuild, xine-lib-1.1.2_pre20060328-r9.ebuild,
diff --git a/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
index 5700169558cf..4801d77ef81b 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r3.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-libs/xine-lib/xine-lib-1.1.1-r3.ebuild,v 1.22 2006/07/07 13:12:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r3.ebuild,v 1.23 2006/07/07 13:17:29 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -27,15 +27,15 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
 			x11-libs/libXext
 			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+		<virtual/x11-7 ) )
+	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
 	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
+		|| ( x11-libs/libXvMC <virtual/x11-7 )
 		nvidia? ( || ( x11-drivers/nvidia-drivers
 			x11-drivers/nvidia-legacy-drivers media-video/nvidia-glx ) )
-		cle266? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		i8x0? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+		cle266? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
+		i8x0? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) ) )
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -68,9 +68,9 @@ DEPEND="${RDEPEND}
 			x11-proto/xproto
 			x11-proto/videoproto
 			x11-proto/xf86vidmodeproto )
-		virtual/x11 )
+		<virtual/x11-7 )
 		)
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild
index 50554ea99f1f..fc6d5ff288d4 100644
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.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-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild,v 1.9 2006/07/07 13:12:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild,v 1.10 2006/07/07 13:17:29 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -40,16 +40,16 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
 			x11-libs/libXext
 			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+		<virtual/x11-7 ) )
+	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
 	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
+		|| ( x11-libs/libXvMC <virtual/x11-7 )
 		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
 			x11-drivers/nvidia-legacy-drivers media-video/nvidia-glx ) )
-		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) )
 	)
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -85,7 +85,7 @@ DEPEND="${RDEPEND}
 			x11-proto/videoproto
 			x11-proto/xf86vidmodeproto
 			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+		<virtual/x11-7 )
 		)
 	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig"
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.ebuild
index 717e58302eab..9829ffd8d8e5 100644
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.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-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.ebuild,v 1.12 2006/07/07 13:12:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r9.ebuild,v 1.13 2006/07/07 13:17:29 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -40,16 +40,16 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
 			x11-libs/libXext
 			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+		<virtual/x11-7 ) )
+	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
 	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
+		|| ( x11-libs/libXvMC <virtual/x11-7 )
 		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
 			x11-drivers/nvidia-legacy-drivers media-video/nvidia-glx ) )
-		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) )
 	)
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -85,7 +85,7 @@ DEPEND="${RDEPEND}
 			x11-proto/videoproto
 			x11-proto/xf86vidmodeproto
 			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+		<virtual/x11-7 )
 		)
 	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig"
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060630-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060630-r1.ebuild
index 9d3fd7d66a8c..e0d9a92017ee 100644
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060630-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060630-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-libs/xine-lib/xine-lib-1.1.2_pre20060630-r1.ebuild,v 1.3 2006/07/07 13:12:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060630-r1.ebuild,v 1.4 2006/07/07 13:17:29 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -37,16 +37,16 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
 			x11-libs/libXext
 			x11-libs/libX11 )
-		virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+		<virtual/x11-7 ) )
+	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
 	xvmc? (
-		|| ( x11-libs/libXvMC virtual/x11 )
+		|| ( x11-libs/libXvMC <virtual/x11-7 )
 		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
 			x11-drivers/nvidia-legacy-drivers media-video/nvidia-glx ) )
-		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) )
 	)
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
@@ -83,7 +83,7 @@ DEPEND="${RDEPEND}
 			x11-proto/videoproto
 			x11-proto/xf86vidmodeproto
 			xinerama? ( x11-proto/xineramaproto ) )
-		virtual/x11 )
+		<virtual/x11-7 )
 		)
 	v4l? ( virtual/os-headers )
 	dev-util/pkgconfig