diff options
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 5 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 2a0833c4f081..c9021ecad2f7 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.384 2009/03/16 13:22:45 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.385 2009/03/19 17:51:11 solar Exp $ + + 19 Mar 2009; <solar@gentoo.org> xorg-server-1.5.3-r5.ebuild: + - tie in the libXCalibrate to wrap up xtscal support when tslib is enabled *xorg-server-1.5.3-r5 (16 Mar 2009) diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild index 92ffd1e148ee..a2a326f9d436 100644 --- a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.5.3-r5.ebuild,v 1.1 2009/03/16 13:22:45 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.2 2009/03/19 17:51:11 solar Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -106,7 +106,7 @@ IUSE="${IUSE_VIDEO_CARDS} 3dfx tslib hal ipv6 minimal nptl sdl" RDEPEND="hal? ( sys-apps/hal ) - tslib? ( x11-libs/tslib ) + tslib? ( x11-libs/tslib x11-libs/libXCalibrate ) >=x11-libs/libXfont-1.3.3 >=x11-libs/xtrans-1.2.2 >=x11-libs/libXau-1.0.4 @@ -202,7 +202,7 @@ PDEPEND=" input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 ) input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 ) - input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate ) input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox ) input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 ) @@ -308,6 +308,7 @@ pkg_setup() { $(use_enable dmx) $(use_enable kdrive) $(use_enable tslib) + $(use_enable tslib xcalibrate) $(use_enable !minimal xvfb) $(use_enable !minimal xnest) $(use_enable !minimal xtrap) |