Update dependencies for drivers that fail to build against xorg-server-1.12.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 19 insertions, 27 deletions

diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog
index 80490ca729d0..df8cd8c886af 100644
--- a/x11-base/xorg-drivers/ChangeLog
+++ b/x11-base/xorg-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.66 2012/03/07 22:06:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.67 2012/03/18 16:39:43 chithanh Exp $
+
+  18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-drivers-1.12.ebuild:
+  Update dependencies for drivers that fail to build against xorg-server-1.12.
 
 *xorg-drivers-1.12 (07 Mar 2012)
 
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 019c71f5106d..d3b17f71f1ad 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,6 +1,6 @@
 EBUILD xorg-drivers-1.10.ebuild 5929 RMD160 15f79f6e534e09538023a1b632a173a242b9f090 SHA1 65304881c17e1eef0f2887a925fcc1e1c9ee4b52 SHA256 a979dbfd4a2ba13e02ca7ceef34485ef881c9a128029fa2366260cc18368a74a
 EBUILD xorg-drivers-1.11.ebuild 5923 RMD160 147b31056630309f6bc7c5f13fb700f73b815e72 SHA1 6e10542c71f4df648ae42100d681a2161ca8b4b8 SHA256 f44ab0030679474ea2506142feb78ca67f18106386003165ebe8d04814638090
-EBUILD xorg-drivers-1.12.ebuild 5934 RMD160 eeccd619cc5200099185205e4e923300a16a9ded SHA1 b065918e582a0ee3b528ff854ea306306901c962 SHA256 5bbc7074a78a2a760b93c556b89d7cb84614af2d488624d36fe20e088eaed3ff
+EBUILD xorg-drivers-1.12.ebuild 5465 RMD160 4eb7d3170f6d8026294bc83e629913f231f0cd89 SHA1 e87fc25b99b4529c7da53dec60acd564d9bb8f4f SHA256 1d77149841c1f9b32a6f937cc10a30c5a14115212d8b464bf1f8ca29786b6931
 EBUILD xorg-drivers-1.9.ebuild 5826 RMD160 f1bb74626420e7faf8f340ed9753ac5bdac9af84 SHA1 008b1cbb5379c511c5824beff30cb47a3d855dea SHA256 2db24855620c629fd1ee23d7ab88ca6424f4fc1c5bb5d166f774d3011979621d
-MISC ChangeLog 8815 RMD160 c53623875779b920dcd9cf20e1fbc873f2295878 SHA1 b5444312a39ca4ad463cb81955fde508b418d428 SHA256 6419539d82d00c2ea29e57b537bd2b4531bd7e06c8ccb5cb43e979c5acf06807
+MISC ChangeLog 8992 RMD160 1d16ef28bb73d3e4558f8669ae426df54eefaaa1 SHA1 8fb51fb5a90f5e64811557704e044064eb42275b SHA256 28f4fb97db3e27e8d8a0641995594f86f88fb3fbde10d8e1daadbb16155fbed9
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
index 65676e44a997..9ba9828283e2 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.1 2012/03/07 22:06:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.2 2012/03/18 16:39:43 chithanh Exp $
 
 EAPI=4
 
@@ -31,20 +31,15 @@ IUSE_INPUT_DEVICES="
 	input_devices_wacom
 "
 IUSE_VIDEO_CARDS="
-	video_cards_apm
 	video_cards_ark
-	video_cards_ast
-	video_cards_chips
 	video_cards_cirrus
 	video_cards_dummy
 	video_cards_epson
 	video_cards_fbdev
 	video_cards_geode
 	video_cards_glint
-	video_cards_i128
 	video_cards_i740
 	video_cards_intel
-	video_cards_impact
 	video_cards_mach64
 	video_cards_mga
 	video_cards_neomagic
@@ -55,13 +50,9 @@ IUSE_VIDEO_CARDS="
 	video_cards_qxl
 	video_cards_r128
 	video_cards_radeon
-	video_cards_rendition
 	video_cards_s3
-	video_cards_s3virge
 	video_cards_savage
 	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
 	video_cards_sunbw2
 	video_cards_suncg14
 	video_cards_suncg3
@@ -69,10 +60,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_sunffb
 	video_cards_sunleo
 	video_cards_suntcx
-	video_cards_tdfx
 	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
 	video_cards_v4l
 	video_cards_vesa
 	video_cards_via
@@ -103,16 +91,12 @@ PDEPEND="
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
 	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
 
-	video_cards_apm?           ( x11-drivers/xf86-video-apm )
 	video_cards_ark?           ( x11-drivers/xf86-video-ark )
-	video_cards_ast?           ( x11-drivers/xf86-video-ast )
-	video_cards_chips?         ( x11-drivers/xf86-video-chips )
 	video_cards_cirrus?        ( x11-drivers/xf86-video-cirrus )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
 	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
 	video_cards_glint?         ( x11-drivers/xf86-video-glint )
-	video_cards_i128?          ( x11-drivers/xf86-video-i128 )
 	video_cards_i740?          ( x11-drivers/xf86-video-i740 )
 	video_cards_intel?         ( x11-drivers/xf86-video-intel )
 	video_cards_mach64?        ( x11-drivers/xf86-video-mach64 )
@@ -127,23 +111,16 @@ PDEPEND="
 	video_cards_fglrx?         ( x11-drivers/ati-drivers )
 	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
 	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_rendition?     ( x11-drivers/xf86-video-rendition )
 	video_cards_s3?            ( x11-drivers/xf86-video-s3 )
-	video_cards_s3virge?       ( x11-drivers/xf86-video-s3virge )
 	video_cards_savage?        ( x11-drivers/xf86-video-savage )
 	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_sis?           ( x11-drivers/xf86-video-sis )
-	video_cards_sisusb?        ( x11-drivers/xf86-video-sisusb )
 	video_cards_suncg14?       ( x11-drivers/xf86-video-suncg14 )
 	video_cards_suncg3?        ( x11-drivers/xf86-video-suncg3 )
 	video_cards_suncg6?        ( x11-drivers/xf86-video-suncg6 )
 	video_cards_sunffb?        ( x11-drivers/xf86-video-sunffb )
 	video_cards_sunleo?        ( x11-drivers/xf86-video-sunleo )
 	video_cards_suntcx?        ( x11-drivers/xf86-video-suntcx )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
 	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 )
@@ -152,8 +129,19 @@ PDEPEND="
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
+	!<=x11-drivers/xf86-video-apm-1.2.3
+	!<=x11-drivers/xf86-video-ast-0.93.9
+	!<=x11-drivers/xf86-video-chips-1.2.4
 	!x11-drivers/xf86-video-cyrix
+	!<=x11-drivers/xf86-video-i128-1.3.4
 	!x11-drivers/xf86-video-impact
 	!x11-drivers/xf86-video-nsc
+	!<=x11-drivers/xf86-video-rendition-4.2.4
+	!<=x11-drivers/xf86-video-s3virge-1.10.4
+	!<=x11-drivers/xf86-video-sis-0.10.3
+	!<=x11-drivers/xf86-video-sisusb-0.9.4
 	!x11-drivers/xf86-video-sunbw2
+	!<=x11-drivers/xf86-video-tdfx-1.4.3
+	!<=x11-drivers/xf86-video-trident-1.3.4
+	!<=x11-drivers/xf86-video-tseng-1.2.4
 "