From 1cda41e8c60515e88e69fd8bade14fef570fc404 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Sun, 18 Mar 2012 16:39:43 +0000 Subject: Update dependencies for drivers that fail to build against xorg-server-1.12. (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- x11-base/xorg-drivers/ChangeLog | 6 ++++- x11-base/xorg-drivers/xorg-drivers-1.12.ebuild | 36 +++++++++----------------- 2 files changed, 17 insertions(+), 25 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 + 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/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 " -- cgit v1.2.3-65-gdbad