diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.99.903.ebuild | 367 | ||||
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild | 378 |
4 files changed, 378 insertions, 381 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index fdd1f8388c04..fbe809ad12a3 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.115 2006/05/13 09:12:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.116 2006/05/13 15:35:13 joshuabaergen Exp $ + + 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.99.903.ebuild: + -m Move driver dependencies from the meta-ebuild to xorg-server as a + PDEPEND. (Michal Suchanek, bug #132696) *xorg-server-1.0.99.903 (13 May 2006) diff --git a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild index 0b2de808506d..18ceda37fdae 100644 --- a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.99.903.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/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild,v 1.1 2006/05/13 09:12:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild,v 1.2 2006/05/13 15:35:13 joshuabaergen Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -23,20 +23,90 @@ SRC_URI="${SRC_URI} http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2" DESCRIPTION="X.Org X servers" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_calcomp + input_devices_citron + input_devices_digitaledge + input_devices_dmc + input_devices_dynapro + input_devices_elo2300 + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_jamstudio + input_devices_joystick + input_devices_keyboard + input_devices_magellan + input_devices_magictouch + input_devices_microtouch + input_devices_mouse + input_devices_mutouch + input_devices_palmax + input_devices_penmount + input_devices_spaceorb + input_devices_summa + input_devices_tek4957 + input_devices_ur98 + input_devices_vmmouse + input_devices_void + + input_devices_synaptics + input_devices_wacom" IUSE_VIDEO_CARDS=" + video_cards_apm + video_cards_ark video_cards_chips + video_cards_cirrus + video_cards_cyrix + video_cards_dummy video_cards_epson + video_cards_fbdev video_cards_glint + video_cards_i128 + video_cards_i740 video_cards_i810 + video_cards_imstt video_cards_mach64 video_cards_mga video_cards_neomagic + video_cards_newport + video_cards_nsc video_cards_nv video_cards_r128 video_cards_radeon + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage video_cards_siliconmotion - video_cards_via" + video_cards_sis + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + 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_vga + video_cards_via + video_cards_vmware + video_cards_voodoo + + video_cards_nvidia + video_cards_fglrx" IUSE="${IUSE_VIDEO_CARDS} + ${IUSE_INPUT_DEVICES} + 3dfx dmx dri ipv6 kdrive minimal nptl sdl xorg xprint" RDEPEND="x11-libs/libXfont x11-libs/xtrans @@ -107,6 +177,299 @@ DEPEND="${RDEPEND} xprint? ( x11-proto/printproto x11-apps/mkfontdir x11-apps/mkfontscale )" + +# Drivers +############################################################################### +############################################################################### +## ## +## REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES ## +## ## +############################################################################### +############################################################################### +PDEPEND=" + || ( + ( + input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 ) + input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 ) + input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 ) + input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 ) + input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 ) + input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 ) + input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 ) + input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 ) + input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 ) + input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 ) + input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 ) + input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 ) + input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 ) + input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 ) + input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 ) + input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 ) + input_devices_magictouch? ( x11-drivers/xf86-input-magictouch ) + input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 ) + input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 ) + input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 ) + input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 ) + input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 ) + input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 ) + input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 ) + input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 ) + input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) + input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 ) + input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 ) + + input_devices_synaptics? ( x11-drivers/synaptics ) + input_devices_wacom? ( x11-misc/linuxwacom ) + ) + ( + >=x11-drivers/xf86-input-acecad-1.1.0 + >=x11-drivers/xf86-input-calcomp-1.1.0 + >=x11-drivers/xf86-input-citron-2.2.0 + >=x11-drivers/xf86-input-digitaledge-1.1.0 + >=x11-drivers/xf86-input-dmc-1.1.0 + >=x11-drivers/xf86-input-dynapro-1.1.0 + >=x11-drivers/xf86-input-elo2300-1.1.0 + >=x11-drivers/xf86-input-elographics-1.1.0 + >=x11-drivers/xf86-input-fpit-1.1.0 + >=x11-drivers/xf86-input-hyperpen-1.1.0 + >=x11-drivers/xf86-input-jamstudio-1.1.0 + >=x11-drivers/xf86-input-joystick-1.1.0 + >=x11-drivers/xf86-input-keyboard-1.1.0 + >=x11-drivers/xf86-input-magellan-1.1.0 + x11-drivers/xf86-input-magictouch + >=x11-drivers/xf86-input-microtouch-1.1.0 + >=x11-drivers/xf86-input-mouse-1.1.0 + >=x11-drivers/xf86-input-mutouch-1.1.0 + >=x11-drivers/xf86-input-palmax-1.1.0 + >=x11-drivers/xf86-input-penmount-1.1.0 + >=x11-drivers/xf86-input-spaceorb-1.1.0 + >=x11-drivers/xf86-input-summa-1.1.0 + >=x11-drivers/xf86-input-tek4957-1.1.0 + >=x11-drivers/xf86-input-void-1.1.0 + + kernel_linux? ( + >=x11-drivers/xf86-input-aiptek-1.0.1 + >=x11-drivers/xf86-input-evdev-1.1.1 + >=x11-drivers/xf86-input-ur98-1.1.0 + ) + + x86? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 + x11-drivers/synaptics + x11-misc/linuxwacom + ) + x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 ) + amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 + x11-drivers/synaptics + x11-misc/linuxwacom + ) + ppc? ( x11-drivers/synaptics + x11-misc/linuxwacom + ) + ppc64? ( x11-drivers/synaptics + x11-misc/linuxwacom + ) + ) + ) + input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 ) + || ( + ( + video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 ) + video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 ) + video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 ) + video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 ) + video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 ) + video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 ) + video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 ) + video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 ) + video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 ) + video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 ) + video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 ) + video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 ) + video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 ) + video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 ) + video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 ) + video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 ) + video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 ) + video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 ) + video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 ) + video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 ) + video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 ) + video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 ) + video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 ) + video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 ) + video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 ) + video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 ) + video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 ) + video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 ) + video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 ) + video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 ) + video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 ) + video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 ) + video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 ) + video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 ) + video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 ) + video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) + + video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) + video_cards_nvidia? ( media-video/nvidia-glx ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + ) + ( + >=x11-drivers/xf86-video-dummy-0.2.0 + >=x11-drivers/xf86-video-fbdev-0.2.0 + + !hppa? ( + >=x11-drivers/xf86-video-ati-6.6.0 + >=x11-drivers/xf86-video-mga-1.4.1 + + >=x11-drivers/xf86-video-sisusb-0.8.1 + kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 ) + ) + + 3dfx? ( >=media-libs/glide-v3-3.10 ) + + alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-rendition-4.1.0 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-siliconmotion-1.4.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-tga-1.1.0 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + amd64? ( >=x11-drivers/xf86-video-apm-1.1.1 + >=x11-drivers/xf86-video-ark-0.6.0 + >=x11-drivers/xf86-video-chips-1.1.1 + >=x11-drivers/xf86-video-cirrus-1.1.0 + >=x11-drivers/xf86-video-cyrix-1.1.0 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-i128-1.2.0 + >=x11-drivers/xf86-video-i810-1.6.0 + >=x11-drivers/xf86-video-neomagic-1.1.1 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-rendition-4.1.0 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-siliconmotion-1.4.1 + >=x11-drivers/xf86-video-sis-0.9.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-tga-1.1.0 + >=x11-drivers/xf86-video-trident-1.2.1 + >=x11-drivers/xf86-video-tseng-1.1.0 + >=x11-drivers/xf86-video-vesa-1.1.0 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-via-0.2.1 + >=x11-drivers/xf86-video-vmware-10.13.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + arm? ( >=x11-drivers/xf86-video-chips-1.1.1 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-sis-0.9.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-trident-1.2.1 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + ia64? ( >=x11-drivers/xf86-video-apm-1.1.1 + >=x11-drivers/xf86-video-ark-0.6.0 + >=x11-drivers/xf86-video-chips-1.1.1 + >=x11-drivers/xf86-video-cirrus-1.1.0 + >=x11-drivers/xf86-video-cyrix-1.1.0 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-i128-1.2.0 + >=x11-drivers/xf86-video-i740-1.1.0 + >=x11-drivers/xf86-video-i810-1.6.0 + >=x11-drivers/xf86-video-imstt-1.1.0 + >=x11-drivers/xf86-video-neomagic-1.1.1 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-rendition-4.1.0 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-siliconmotion-1.4.1 + >=x11-drivers/xf86-video-sis-0.9.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-tga-1.1.0 + >=x11-drivers/xf86-video-trident-1.2.1 + >=x11-drivers/xf86-video-tseng-1.1.0 + >=x11-drivers/xf86-video-vesa-1.1.0 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-via-0.2.1 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + mips? ( >=x11-drivers/xf86-video-newport-0.2.0 ) + ppc? ( >=x11-drivers/xf86-video-chips-1.1.1 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-imstt-1.1.0 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-sis-0.9.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-trident-1.2.1 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + ppc64? ( >=x11-drivers/xf86-video-nv-1.1.1 ) + sparc? ( + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-sunbw2-1.1.0 + >=x11-drivers/xf86-video-suncg14-1.1.0 + >=x11-drivers/xf86-video-suncg3-1.1.0 + >=x11-drivers/xf86-video-suncg6-1.1.0 + >=x11-drivers/xf86-video-sunffb-1.1.0 + >=x11-drivers/xf86-video-sunleo-1.1.0 + >=x11-drivers/xf86-video-suntcx-1.1.0 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-vesa-1.1.0 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + x86? ( >=x11-drivers/xf86-video-apm-1.1.1 + >=x11-drivers/xf86-video-ark-0.6.0 + >=x11-drivers/xf86-video-chips-1.1.1 + >=x11-drivers/xf86-video-cirrus-1.1.0 + >=x11-drivers/xf86-video-cyrix-1.1.0 + >=x11-drivers/xf86-video-glint-1.1.1 + >=x11-drivers/xf86-video-i128-1.2.0 + >=x11-drivers/xf86-video-i740-1.1.0 + >=x11-drivers/xf86-video-i810-1.6.0 + >=x11-drivers/xf86-video-imstt-1.1.0 + >=x11-drivers/xf86-video-neomagic-1.1.1 + >=x11-drivers/xf86-video-nsc-2.8.1 + >=x11-drivers/xf86-video-nv-1.1.1 + >=x11-drivers/xf86-video-rendition-4.1.0 + >=x11-drivers/xf86-video-s3-0.4.1 + >=x11-drivers/xf86-video-s3virge-1.9.1 + >=x11-drivers/xf86-video-savage-2.1.1 + >=x11-drivers/xf86-video-siliconmotion-1.4.1 + >=x11-drivers/xf86-video-sis-0.9.1 + >=x11-drivers/xf86-video-tdfx-1.2.1 + >=x11-drivers/xf86-video-tga-1.1.0 + >=x11-drivers/xf86-video-trident-1.2.1 + >=x11-drivers/xf86-video-tseng-1.1.0 + >=x11-drivers/xf86-video-vesa-1.1.0 + >=x11-drivers/xf86-video-vga-4.1.0 + >=x11-drivers/xf86-video-via-0.2.1 + >=x11-drivers/xf86-video-vmware-10.13.0 + >=x11-drivers/xf86-video-voodoo-1.1.0 ) + x86-fbsd? ( + >=x11-drivers/xf86-video-vmware-10.13.0 ) + ) + )" LICENSE="${LICENSE} MIT" pkg_setup() { diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index db8e0ba2d4c2..0887c56fa7d7 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.540 2006/05/13 14:35:22 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.541 2006/05/13 15:34:42 joshuabaergen Exp $ + + 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-x11-7.1_rc2.ebuild: + -m Move driver dependencies from the meta-ebuild to xorg-server as a + PDEPEND. (Michal Suchanek, bug #132696) *xorg-x11-7.1_rc2 (13 May 2006) diff --git a/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild index dcbb2ff79dd0..659069e2feb4 100644 --- a/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.1_rc2.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/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild,v 1.1 2006/05/13 14:35:22 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild,v 1.2 2006/05/13 15:34:42 joshuabaergen Exp $ inherit eutils @@ -10,89 +10,6 @@ HOMEPAGE="http://xorg.freedesktop.org" LICENSE="as-is" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_calcomp - input_devices_citron - input_devices_digitaledge - input_devices_dmc - input_devices_dynapro - input_devices_elo2300 - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_jamstudio - input_devices_joystick - input_devices_keyboard - input_devices_magellan - input_devices_magictouch - input_devices_microtouch - input_devices_mouse - input_devices_mutouch - input_devices_palmax - input_devices_penmount - input_devices_spaceorb - input_devices_summa - input_devices_tek4957 - input_devices_ur98 - input_devices_vmmouse - input_devices_void - - input_devices_synaptics - input_devices_wacom" -IUSE_VIDEO_CARDS=" - video_cards_apm - video_cards_ark - video_cards_chips - video_cards_cirrus - video_cards_cyrix - video_cards_dummy - video_cards_fbdev - video_cards_glint - video_cards_i128 - video_cards_i740 - video_cards_i810 - video_cards_imstt - video_cards_mach64 - video_cards_mga - video_cards_neomagic - video_cards_newport - video_cards_nsc - video_cards_nv - 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 - video_cards_suncg6 - 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_vga - video_cards_via - video_cards_vmware - video_cards_voodoo - - video_cards_nvidia - video_cards_fglrx" -IUSE="${IUSE_VIDEO_CARDS} - ${IUSE_INPUT_DEVICES} - 3dfx" # Collision protect will scream bloody murder if we install over old versions RDEPEND="!<=x11-base/xorg-x11-6.9" @@ -140,299 +57,6 @@ RDEPEND="${RDEPEND} RDEPEND="${RDEPEND} >=sys-apps/portage-2.1_pre4" -# Drivers -############################################################################### -############################################################################### -## ## -## REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES ## -## ## -############################################################################### -############################################################################### -RDEPEND="${RDEPEND} - || ( - ( - input_devices_acecad? ( x11-drivers/xf86-input-acecad ) - input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) - input_devices_calcomp? ( x11-drivers/xf86-input-calcomp ) - input_devices_citron? ( x11-drivers/xf86-input-citron ) - input_devices_digitaledge? ( x11-drivers/xf86-input-digitaledge ) - input_devices_dmc? ( x11-drivers/xf86-input-dmc ) - input_devices_dynapro? ( x11-drivers/xf86-input-dynapro ) - input_devices_elo2300? ( x11-drivers/xf86-input-elo2300 ) - input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_fpit? ( x11-drivers/xf86-input-fpit ) - input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) - input_devices_jamstudio? ( x11-drivers/xf86-input-jamstudio ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) - input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) - input_devices_magellan? ( x11-drivers/xf86-input-magellan ) - input_devices_magictouch? ( x11-drivers/xf86-input-magictouch ) - input_devices_microtouch? ( x11-drivers/xf86-input-microtouch ) - input_devices_mouse? ( x11-drivers/xf86-input-mouse ) - input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) - input_devices_palmax? ( x11-drivers/xf86-input-palmax ) - input_devices_penmount? ( x11-drivers/xf86-input-penmount ) - input_devices_spaceorb? ( x11-drivers/xf86-input-spaceorb ) - input_devices_summa? ( x11-drivers/xf86-input-summa ) - input_devices_tek4957? ( x11-drivers/xf86-input-tek4957 ) - input_devices_ur98? ( x11-drivers/xf86-input-ur98 ) - input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) - input_devices_void? ( x11-drivers/xf86-input-void ) - - input_devices_synaptics? ( x11-drivers/synaptics ) - input_devices_wacom? ( x11-misc/linuxwacom ) - ) - ( - x11-drivers/xf86-input-acecad - x11-drivers/xf86-input-calcomp - x11-drivers/xf86-input-citron - x11-drivers/xf86-input-digitaledge - x11-drivers/xf86-input-dmc - x11-drivers/xf86-input-dynapro - x11-drivers/xf86-input-elo2300 - x11-drivers/xf86-input-elographics - x11-drivers/xf86-input-fpit - x11-drivers/xf86-input-hyperpen - x11-drivers/xf86-input-jamstudio - x11-drivers/xf86-input-joystick - x11-drivers/xf86-input-keyboard - x11-drivers/xf86-input-magellan - x11-drivers/xf86-input-magictouch - x11-drivers/xf86-input-microtouch - x11-drivers/xf86-input-mouse - x11-drivers/xf86-input-mutouch - x11-drivers/xf86-input-palmax - x11-drivers/xf86-input-penmount - x11-drivers/xf86-input-spaceorb - x11-drivers/xf86-input-summa - x11-drivers/xf86-input-tek4957 - x11-drivers/xf86-input-void - - kernel_linux? ( - x11-drivers/xf86-input-aiptek - x11-drivers/xf86-input-evdev - x11-drivers/xf86-input-ur98 - ) - - x86? ( x11-drivers/xf86-input-vmmouse - x11-drivers/synaptics - x11-misc/linuxwacom - ) - x86-fbsd? ( x11-drivers/xf86-input-vmmouse ) - amd64? ( x11-drivers/xf86-input-vmmouse - x11-drivers/synaptics - x11-misc/linuxwacom - ) - ppc? ( x11-drivers/synaptics - x11-misc/linuxwacom - ) - ppc64? ( x11-drivers/synaptics - x11-misc/linuxwacom - ) - ) - ) - input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 ) - || ( - ( - video_cards_apm? ( x11-drivers/xf86-video-apm ) - video_cards_ark? ( x11-drivers/xf86-video-ark ) - video_cards_chips? ( x11-drivers/xf86-video-chips ) - video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) - video_cards_cyrix? ( x11-drivers/xf86-video-cyrix ) - video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) - 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_i810? ( x11-drivers/xf86-video-i810 ) - video_cards_imstt? ( x11-drivers/xf86-video-imstt ) - video_cards_mach64? ( x11-drivers/xf86-video-ati ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) - video_cards_newport? ( x11-drivers/xf86-video-newport ) - video_cards_nsc? ( x11-drivers/xf86-video-nsc ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_r128? ( x11-drivers/xf86-video-ati ) - 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_sunbw2? ( x11-drivers/xf86-video-sunbw2 ) - 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_vga? ( x11-drivers/xf86-video-vga ) - video_cards_via? ( x11-drivers/xf86-video-via ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) - video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) - - video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - video_cards_nvidia? ( media-video/nvidia-glx ) - video_cards_fglrx? ( x11-drivers/ati-drivers ) - ) - ( - x11-drivers/xf86-video-dummy - x11-drivers/xf86-video-fbdev - - !hppa? ( - x11-drivers/xf86-video-ati - x11-drivers/xf86-video-mga - - x11-drivers/xf86-video-sisusb - kernel_linux? ( x11-drivers/xf86-video-v4l ) - ) - - 3dfx? ( >=media-libs/glide-v3-3.10 ) - - alpha? ( x11-drivers/xf86-video-cirrus - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-rendition - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-siliconmotion - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-tga - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-voodoo ) - amd64? ( x11-drivers/xf86-video-apm - x11-drivers/xf86-video-ark - x11-drivers/xf86-video-chips - x11-drivers/xf86-video-cirrus - x11-drivers/xf86-video-cyrix - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-i128 - x11-drivers/xf86-video-i810 - x11-drivers/xf86-video-neomagic - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-rendition - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-siliconmotion - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-tga - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-tseng - x11-drivers/xf86-video-vesa - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-via - x11-drivers/xf86-video-vmware - x11-drivers/xf86-video-voodoo ) - arm? ( x11-drivers/xf86-video-chips - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-voodoo ) - ia64? ( x11-drivers/xf86-video-apm - x11-drivers/xf86-video-ark - x11-drivers/xf86-video-chips - x11-drivers/xf86-video-cirrus - x11-drivers/xf86-video-cyrix - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-i128 - x11-drivers/xf86-video-i740 - x11-drivers/xf86-video-i810 - x11-drivers/xf86-video-imstt - x11-drivers/xf86-video-neomagic - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-rendition - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-siliconmotion - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-tga - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-tseng - x11-drivers/xf86-video-vesa - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-via - x11-drivers/xf86-video-voodoo ) - mips? ( x11-drivers/xf86-video-newport ) - ppc? ( x11-drivers/xf86-video-chips - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-imstt - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-voodoo ) - ppc64? ( x11-drivers/xf86-video-nv ) - sparc? ( - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-sunbw2 - x11-drivers/xf86-video-suncg14 - x11-drivers/xf86-video-suncg3 - x11-drivers/xf86-video-suncg6 - x11-drivers/xf86-video-sunffb - x11-drivers/xf86-video-sunleo - x11-drivers/xf86-video-suntcx - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-vesa - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-voodoo ) - x86? ( x11-drivers/xf86-video-apm - x11-drivers/xf86-video-ark - x11-drivers/xf86-video-chips - x11-drivers/xf86-video-cirrus - x11-drivers/xf86-video-cyrix - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-i128 - x11-drivers/xf86-video-i740 - x11-drivers/xf86-video-i810 - x11-drivers/xf86-video-imstt - x11-drivers/xf86-video-neomagic - x11-drivers/xf86-video-nsc - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-rendition - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-siliconmotion - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-tga - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-tseng - x11-drivers/xf86-video-vesa - x11-drivers/xf86-video-vga - x11-drivers/xf86-video-via - x11-drivers/xf86-video-vmware - x11-drivers/xf86-video-voodoo ) - x86-fbsd? ( - x11-drivers/xf86-video-vmware ) - ) - )" - DEPEND="${RDEPEND}" src_install() { |