8 files changed, 20 insertions, 35 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 4eac749491ef..4a9ae44d1d1d 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.186 2006/09/22 23:52:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.187 2006/10/01 17:58:37 flameeyes Exp $
+
+  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4a-r1.ebuild,
+  vlc-0.8.5-r3.ebuild, vlc-0.8.5-r5.ebuild:
+  Remove build-time dependency on xproto and/or xextproto.
 
   22 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4a-r1.ebuild,
   vlc-0.8.5-r3.ebuild, vlc-0.8.5-r5.ebuild:
diff --git a/media-video/vlc/vlc-0.8.4a-r1.ebuild b/media-video/vlc/vlc-0.8.4a-r1.ebuild
index 3905091d8f57..b284ec310da4 100644
--- a/media-video/vlc/vlc-0.8.4a-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.4a-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/vlc/vlc-0.8.4a-r1.ebuild,v 1.18 2006/09/22 23:52:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4a-r1.ebuild,v 1.19 2006/10/01 17:58:37 flameeyes Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -99,12 +99,7 @@ RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 		)"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 )
-	)
+	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/vlc/vlc-0.8.5-r3.ebuild b/media-video/vlc/vlc-0.8.5-r3.ebuild
index c7c25461a03f..21f6fb46ac02 100644
--- a/media-video/vlc/vlc-0.8.5-r3.ebuild
+++ b/media-video/vlc/vlc-0.8.5-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-video/vlc/vlc-0.8.5-r3.ebuild,v 1.9 2006/09/22 23:53:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r3.ebuild,v 1.10 2006/10/01 17:58:37 flameeyes Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -99,12 +99,7 @@ RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 		upnp? ( >=net-misc/upnp-1.2 )"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 )
-	)
+	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/vlc/vlc-0.8.5-r5.ebuild b/media-video/vlc/vlc-0.8.5-r5.ebuild
index 25a80ea41c72..79e858d48c05 100644
--- a/media-video/vlc/vlc-0.8.5-r5.ebuild
+++ b/media-video/vlc/vlc-0.8.5-r5.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/vlc/vlc-0.8.5-r5.ebuild,v 1.6 2006/09/22 23:53:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r5.ebuild,v 1.7 2006/10/01 17:58:37 flameeyes Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -105,12 +105,7 @@ RDEPEND="
 		)"
 
 DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) <virtual/x11-7 )
-	)
+	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index b453c8de3ebf..6efe785a5525 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.132 2006/09/24 17:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.133 2006/10/01 18:01:20 flameeyes Exp $
+
+  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.4-r5.ebuild, xine-ui-0.99.4-r6.ebuild,
+  xine-ui-0.99.5_pre20060716.ebuild:
+  Remove build-time dependency on xproto and/or xextproto.
 
   24 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-ui-0.99.4-r5.ebuild, xine-ui-0.99.4-r6.ebuild,
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild
index 865cae9fecb2..c006e1f0ee5d 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r5.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/xine-ui/xine-ui-0.99.4-r5.ebuild,v 1.13 2006/09/24 17:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild,v 1.14 2006/10/01 18:01:20 flameeyes Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -40,10 +40,7 @@ RDEPEND="media-libs/libpng
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	X? ( || ( (
-			x11-libs/libX11
 			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
 			x11-proto/xineramaproto
 		) <virtual/x11-7 ) )"
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild
index c98621de7bdb..616862910bee 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r6.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/xine-ui/xine-ui-0.99.4-r6.ebuild,v 1.5 2006/09/24 17:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild,v 1.6 2006/10/01 18:01:20 flameeyes Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -41,10 +41,7 @@ RDEPEND="media-libs/libpng
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	X? ( || ( (
-			x11-libs/libX11
 			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
 			x11-proto/xineramaproto
 		) <virtual/x11-7 ) )"
diff --git a/media-video/xine-ui/xine-ui-0.99.5_pre20060716.ebuild b/media-video/xine-ui/xine-ui-0.99.5_pre20060716.ebuild
index 6c33ab94e54a..e8b8b68a916a 100644
--- a/media-video/xine-ui/xine-ui-0.99.5_pre20060716.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.5_pre20060716.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/xine-ui/xine-ui-0.99.5_pre20060716.ebuild,v 1.2 2006/09/24 17:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5_pre20060716.ebuild,v 1.3 2006/10/01 18:01:20 flameeyes Exp $
 
 # WANT_AUTOCONF=latest
 # WANT_AUTOMAKE=latest
@@ -41,10 +41,7 @@ RDEPEND=">=media-libs/libpng-1.2.8
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	X? ( || ( (
-			x11-libs/libX11
 			x11-libs/libXt
-			x11-proto/xextproto
-			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
 			xinerama? ( x11-proto/xineramaproto )
 		) <virtual/x11-7 ) )