Remove build-time dependency on xproto and/or xextproto.

Package-Manager: portage-2.1.2_pre2

7 files changed, 20 insertions, 22 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index 4ec6d6c2da63..9ee36165f007 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/kdetv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.25 2006/09/26 05:20:56 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.26 2006/10/01 17:40:51 flameeyes Exp $
+
+  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kdetv-0.8.8-r1.ebuild:
+  Remove build-time dependency on xproto and/or xextproto.
 
   26 Sep 2006; Joshua Jackson <tsunam@gentoo.org> kdetv-0.8.8-r1.ebuild:
   Filtering fforce-addr on x86 via bug #145754
diff --git a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
index 96ec5b6df359..7b31292c7765 100644
--- a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.8-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-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.10 2006/09/26 05:20:56 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.11 2006/10/01 17:40:51 flameeyes Exp $
 
 LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
 LANGS_DOC="da et fr it nl pt ru sv"
@@ -34,11 +34,7 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 		) <virtual/x11-7 )"
 
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/videoproto
-		x11-proto/xproto
-		x11-proto/xextproto
-		) <virtual/x11-7 )
+	|| ( x11-proto/videoproto <virtual/x11-7 )
 	virtual/os-headers"
 
 need-kde 3.2
@@ -49,7 +45,7 @@ PATCHES="${FILESDIR}/${P}-xinerama.patch
 src_compile() {
 	local myconf="$(use_enable arts) $(use_enable lirc kdetv-lirc)
 		$(use_with zvbi) $(use_with opengl gl)"
-	#Filtering the below on x86 for bug #145754	
+	#Filtering the below on x86 for bug #145754
 	if [ "$ARCH" == "x86" ]; then
 		filter-flags -fforce-addr
 	fi
diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index eeb02417562d..a1e5012b9815 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.47 2006/08/16 21:12:34 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.48 2006/10/01 17:42:03 flameeyes Exp $
+
+  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
+  Remove build-time dependency on xproto and/or xextproto.
 
   16 Aug 2006; Joshua Jackson <tsunam@gentoo.org> xawtv-3.95-r1.ebuild:
   Stable x86; for bug #138606
diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
index 6ae241a9fde7..0ebe7d58b436 100644
--- a/media-tv/xawtv/xawtv-3.95-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-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-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.14 2006/08/16 21:12:34 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.15 2006/10/01 17:42:03 flameeyes Exp $
 
 inherit eutils font autotools flag-o-matic
 
@@ -55,8 +55,6 @@ DEPEND="${RDEPEND}
 				x11-apps/xset
 				x11-apps/bdftopcf
 				x11-proto/videoproto
-				x11-proto/xproto
-				x11-proto/xextproto
 				xext? ( x11-proto/xineramaproto )
 			) <virtual/x11-7 )
 		)"
diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index ca51b40d6462..1f74b4e18c62 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.39 2006/08/31 08:31:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.40 2006/10/01 17:43:14 flameeyes Exp $
+
+  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.2.0-r1.ebuild,
+  xdtv-2.3.3.ebuild:
+  Remove build-time dependency on xproto and/or xextproto.
 
   31 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.3.3.ebuild:
   Disable x264 support for now, it's not API stable. See bug #145343.
diff --git a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
index 39fad99daacc..027417b1b0ae 100644
--- a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
+++ b/media-tv/xdtv/xdtv-2.2.0-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-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.10 2006/07/09 05:36:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.11 2006/10/01 17:43:14 flameeyes Exp $
 
 inherit font multilib autotools
 
@@ -100,11 +100,7 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 
 DEPEND="${RDEPEND}
 	dvb? ( media-tv/linuxtv-dvb-headers )
-	|| ( (
-		x11-proto/videoproto
-		x11-proto/xproto
-		x11-proto/xextproto )
-		<virtual/x11-7 )"
+	|| ( x11-proto/videoproto <virtual/x11-7 )"
 
 FONT_S="${S}/font"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-tv/xdtv/xdtv-2.3.3.ebuild b/media-tv/xdtv/xdtv-2.3.3.ebuild
index c61d65c75cf3..5d1f96b68af8 100644
--- a/media-tv/xdtv/xdtv-2.3.3.ebuild
+++ b/media-tv/xdtv/xdtv-2.3.3.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-tv/xdtv/xdtv-2.3.3.ebuild,v 1.3 2006/08/31 08:31:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.3.ebuild,v 1.4 2006/10/01 17:43:14 flameeyes Exp $
 
 inherit font multilib autotools flag-o-matic
 
@@ -60,8 +60,6 @@ DEPEND="${RDEPEND}
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	nls? ( sys-devel/gettext )
 	|| ( ( x11-proto/videoproto
-			x11-proto/xproto
-			x11-proto/xextproto
 			x11-apps/bdftopcf
 			x11-apps/mkfontdir
 			x11-apps/mkfontscale