Move linux-headers into DEPEND

(Portage version: 2.1.3.16)

4 files changed, 16 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b388c08689e1..c7adb682cfa6 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.270 2007/10/22 19:16:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.271 2007/10/26 17:10:50 beandog Exp $
+
+  26 Oct 2007; Steve Dibb <beandog@gentoo.org> vlc-0.8.6c.ebuild,
+  vlc-0.9.0_alpha20071009.ebuild, vlc-0.9.0_alpha20071022.ebuild:
+  Move linux-headers into DEPEND
 
   22 Oct 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6c.ebuild:
   backport patch from trunk for 0.8.6c to have a much cleaner directfb
diff --git a/media-video/vlc/vlc-0.8.6c.ebuild b/media-video/vlc/vlc-0.8.6c.ebuild
index cfa96af43971..b5511fee1595 100644
--- a/media-video/vlc/vlc-0.8.6c.ebuild
+++ b/media-video/vlc/vlc-0.8.6c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.12 2007/10/22 19:16:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6c.ebuild,v 1.13 2007/10/26 17:10:50 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -91,8 +91,6 @@ RDEPEND="
 		daap? ( >=media-libs/libopendaap-0.3.0 )
 		corba? ( >=gnome-base/orbit-2.8.0
 			>=dev-libs/glib-2.3.2 )
-		v4l? ( sys-kernel/linux-headers )
-		dvb? ( sys-kernel/linux-headers )
 		mod? ( media-libs/libmodplug )
 		speex? ( media-libs/speex )
 		svg? ( >=gnome-base/librsvg-2.5.0 )
@@ -121,6 +119,8 @@ RDEPEND="
 			<media-libs/libdc1394-1.9.99 )"
 
 DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	dvb? ( sys-kernel/linux-headers )
 	X? ( xinerama? ( x11-proto/xineramaproto ) )
 	dev-util/pkgconfig"
 
diff --git a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
index ea607b1d4683..4f122112ba80 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.11 2007/10/13 00:12:21 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.12 2007/10/26 17:10:50 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -68,7 +68,6 @@ RDEPEND="
 			<media-libs/libdc1394-1.9.99 )
 		directfb? ( dev-libs/DirectFB )
 		dts? ( media-libs/libdca )
-		dvb? ( sys-kernel/linux-headers )
 		dvd? (	media-libs/libdvdread
 				media-libs/libdvdcss
 				>=media-libs/libdvdnav-0.1.9
@@ -119,8 +118,6 @@ RDEPEND="
 			media-fonts/ttf-bitstream-vera )
 		twolame? ( media-sound/twolame )
 		upnp? ( net-libs/libupnp )
-		v4l? ( sys-kernel/linux-headers )
-		v4l2? ( sys-kernel/linux-headers )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
 		wxwindows? ( =x11-libs/wxGTK-2.6* )
@@ -149,6 +146,9 @@ RDEPEND="
 # libgcrypt is mandatory at buildtime, and that's not only a matter of missing
 # m4s. Bug #195322
 DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
 	X? ( xinerama? ( x11-proto/xineramaproto ) )
 	dev-util/pkgconfig
 	>=dev-libs/libgcrypt-1.2.0"
diff --git a/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild b/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild
index 28ce3c3cb668..6763d9c7a518 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild,v 1.1 2007/10/22 17:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071022.ebuild,v 1.2 2007/10/26 17:10:50 beandog Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -68,7 +68,6 @@ RDEPEND="
 			<media-libs/libdc1394-1.9.99 )
 		directfb? ( dev-libs/DirectFB )
 		dts? ( media-libs/libdca )
-		dvb? ( sys-kernel/linux-headers )
 		dvd? (	media-libs/libdvdread
 				media-libs/libdvdcss
 				>=media-libs/libdvdnav-0.1.9
@@ -119,8 +118,6 @@ RDEPEND="
 			media-fonts/ttf-bitstream-vera )
 		twolame? ( media-sound/twolame )
 		upnp? ( net-libs/libupnp )
-		v4l? ( sys-kernel/linux-headers )
-		v4l2? ( sys-kernel/linux-headers )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
 		wxwindows? ( =x11-libs/wxGTK-2.6* )
@@ -151,6 +148,9 @@ RDEPEND="
 # libgcrypt is mandatory at buildtime, and that's not only a matter of missing
 # m4s. Bug #195322
 DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
 	X? ( xinerama? ( x11-proto/xineramaproto ) )
 	dev-util/pkgconfig
 	>=dev-libs/libgcrypt-1.2.0"