diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-01-28 23:20:39 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-01-28 23:20:39 +0000 |
| commit | b88a12c8c6ddde9d2224c354bde94bd15b4c725d (patch) | |
| tree | 6be3719fd9471bc44f2cd89decd407ffb1695bf7 /x11-base | |
| parent | First pass at not pulling in packages that are known to be useless on particu... (diff) | |
| download | gentoo-2-b88a12c8c6ddde9d2224c354bde94bd15b4c725d.tar.gz gentoo-2-b88a12c8c6ddde9d2224c354bde94bd15b4c725d.tar.bz2 gentoo-2-b88a12c8c6ddde9d2224c354bde94bd15b4c725d.zip | |
Second pass. Cleanup by moving arch-conditional parts to ends of blocks. Add x11-misc/linuxwacom.
(Portage version: 2.1_pre4)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild | 45 |
2 files changed, 33 insertions, 19 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 2450a3ada384..e736a8c732b1 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.511 2006/01/28 23:16:39 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.512 2006/01/28 23:20:39 spyderous Exp $ + + 28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-7.0-r1.ebuild: + Second pass. Cleanup by moving arch-conditional parts to ends of blocks. Add + x11-misc/linuxwacom. 28 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-7.0-r1.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild index 9f75dd77c7ca..0097576706f2 100644 --- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.0-r1.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.0-r1.ebuild,v 1.3 2006/01/28 23:16:40 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.4 2006/01/28 23:20:39 spyderous Exp $ inherit eutils @@ -41,7 +41,8 @@ IUSE_INPUT_DEVICES=" input_devices_vmmouse input_devices_void - input_devices_synaptics" + input_devices_synaptics + input_devices_wacom" IUSE_VIDEO_CARDS=" video_cards_apm video_cards_ark @@ -171,6 +172,7 @@ RDEPEND="${RDEPEND} 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 @@ -199,13 +201,19 @@ RDEPEND="${RDEPEND} x11-drivers/xf86-input-summa x11-drivers/xf86-input-tek4957 x11-drivers/xf86-input-ur98 - amd64? ( x11-drivers/xf86-input-vmmouse ) - x86? ( x11-drivers/xf86-input-vmmouse ) x11-drivers/xf86-input-void - x86? ( x11-drivers/synaptics ) - amd64? ( x11-drivers/synaptics ) - ppc? ( x11-drivers/synaptics ) + x86? ( x11-drivers/xf86-input-vmmouse + x11-drivers/synaptics + x11-misc/linuxwacom + ) + amd64? ( x11-drivers/xf86-input-vmmouse + x11-drivers/synaptics + x11-misc/linuxwacom + ) + ppc? ( x11-drivers/synaptics + x11-misc/linuxwacom + ) ) ) || ( @@ -283,14 +291,6 @@ RDEPEND="${RDEPEND} x11-drivers/xf86-video-siliconmotion x11-drivers/xf86-video-sis x11-drivers/xf86-video-sisusb - sparc? ( 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-tga x11-drivers/xf86-video-trident @@ -299,11 +299,20 @@ RDEPEND="${RDEPEND} x11-drivers/xf86-video-vesa x11-drivers/xf86-video-vga x11-drivers/xf86-video-via - x86? ( x11-drivers/xf86-video-vmware ) - amd64? ( x11-drivers/xf86-video-vmware ) x11-drivers/xf86-video-voodoo - x86? ( >=media-libs/glide-v3-3.10 ) + sparc? ( 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 + ) + x86? ( x11-drivers/xf86-video-vmware + >=media-libs/glide-v3-3.10 + ) + amd64? ( x11-drivers/xf86-video-vmware ) alpha? ( >=media-libs/glide-v3-3.10 ) ) )" |