[gentoo-commits] proj/x11:master commit in: x11-base/xorg-drivers/, media-libs/mesa/

[gentoo-commits] proj/x11:master commit in: x11-base/xorg-drivers/, media-libs/mesa/

[Chí-Thanh Christopher Nguyễn]

commit:     97a8d66992fe3b10795ecb578375fabbae7fe99e
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  8 15:01:07 2015 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Sun Feb  8 15:01:07 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=97a8d669

x11-base/xorg-drivers: drop modesetting and v4l

modesetting is now part of xorg-server
v4l fails to build

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=539172

---
 media-libs/mesa/mesa-9999.ebuild               | 2 +-
 x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3005cbf..2656e3e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -80,7 +80,7 @@ REQUIRED_USE="
 	video_cards_radeon? ( || ( classic gallium ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium llvm )
+	video_cards_r300?   ( gallium )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )

diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index d4bf0b2..b32ecd8 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -46,7 +46,6 @@ IUSE_VIDEO_CARDS="
 	video_cards_intel
 	video_cards_mach64
 	video_cards_mga
-	video_cards_modesetting
 	video_cards_neomagic
 	video_cards_nouveau
 	video_cards_nv
@@ -74,7 +73,6 @@ IUSE_VIDEO_CARDS="
 	video_cards_tga
 	video_cards_trident
 	video_cards_tseng
-	video_cards_v4l
 	video_cards_vesa
 	video_cards_via
 	video_cards_virtualbox
@@ -118,7 +116,6 @@ PDEPEND="
 	video_cards_intel?         ( x11-drivers/xf86-video-intel )
 	video_cards_mach64?        ( x11-drivers/xf86-video-mach64 )
 	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_modesetting?   ( x11-drivers/xf86-video-modesetting )
 	video_cards_neomagic?      ( x11-drivers/xf86-video-neomagic )
 	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
 	video_cards_nv?            ( x11-drivers/xf86-video-nv )
@@ -147,7 +144,6 @@ PDEPEND="
 	video_cards_tga?           ( x11-drivers/xf86-video-tga )
 	video_cards_trident?       ( x11-drivers/xf86-video-trident )
 	video_cards_tseng?         ( x11-drivers/xf86-video-tseng )
-	video_cards_v4l?           ( x11-drivers/xf86-video-v4l )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-virtualbox )
@@ -162,4 +158,5 @@ PDEPEND="
 	!<=x11-drivers/xf86-video-ark-0.7.5
 	!<=x11-drivers/xf86-video-newport-0.2.4
 	!<=x11-drivers/xf86-video-sis-0.10.7
+	!<=x11-drivers/xf86-video-v4l-0.2.0
 "