summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2009-03-19 17:51:11 +0000
committerNed Ludd <solar@gentoo.org>2009-03-19 17:51:11 +0000
commit4f3ee82a04ebe65f5cf71647c3d626840b8d7ad0 (patch)
tree35ea6aeeedf247a18116b61ea9b85f17a708951f /x11-base/xorg-server
parentfix dep syntax (diff)
downloadhistorical-4f3ee82a04ebe65f5cf71647c3d626840b8d7ad0.tar.gz
historical-4f3ee82a04ebe65f5cf71647c3d626840b8d7ad0.tar.bz2
historical-4f3ee82a04ebe65f5cf71647c3d626840b8d7ad0.zip
- tie in the libXCalibrate to wrap up xtscal support when tslib is enabled
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/ChangeLog5
-rw-r--r--x11-base/xorg-server/Manifest4
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild7
3 files changed, 10 insertions, 6 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/Manifest b/x11-base/xorg-server/Manifest
index 42c93185b8e5..7221991941ad 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -66,7 +66,7 @@ EBUILD xorg-server-1.5.3-r1.ebuild 16641 RMD160 77f9c8b6ac1f78a9f667148f908f7fe4
EBUILD xorg-server-1.5.3-r2.ebuild 16531 RMD160 25a3a70c81d9f6e71adb1d7da2a91aacfc2b1d78 SHA1 247310d33a664cee3e1db60e009d61200e84ae5d SHA256 e072812ff649277182f1eeec050f8c162149ace377e2ba772085d8ca14708bc8
EBUILD xorg-server-1.5.3-r3.ebuild 16713 RMD160 192b75518fd0e8eb7d5c0317be986c63a604c7f5 SHA1 6692c1f7e04a186a8cdfa910d9479dd73b457095 SHA256 4b4ee869db230be8048a4437f2b1045d373bbd48d0906a2d8baa099ca168e9ca
EBUILD xorg-server-1.5.3-r4.ebuild 16671 RMD160 1e728e523e9be0601e1e59a160b6203c4e4a7102 SHA1 c64664b4b5b4eb2ac5283016204a4ccddeb7cd6e SHA256 c054bfdbf37362c0aff7d6ad456792f2429d337c26a6b4a458e723232e812591
-EBUILD xorg-server-1.5.3-r5.ebuild 16668 RMD160 98437f2fb1206357d46e5ac70d5dc52f5aa6f097 SHA1 fb9b40433c248f654f0546bc8ba10ac4339cb412 SHA256 49cefa3f85923ae5f23004399a3cd4df9be912c7bc85824fd2fe63aa8ac88c09
+EBUILD xorg-server-1.5.3-r5.ebuild 16748 RMD160 560fbed2ce90cedfc3196d4d28c5037337872330 SHA1 c5ec5784cdc5b95c459b945b02c9e0c82cac6e45 SHA256 780251c8ba82f2d3ba74b25889b6cb93aa0de7d711a60e142eae6cf106e84aed
EBUILD xorg-server-1.5.3.ebuild 16640 RMD160 fb711f0e82417acb3699aea636fb7c366619c5b8 SHA1 ee7555228b96c5d5bbeba51670f96a20f5f5e5e2 SHA256 f964b797bc6ba5b8fabf9aa12e33f9c8ed4139eaee25342e10f6470ace344921
-MISC ChangeLog 91228 RMD160 7ab30ae2b2bf2761531a974a1d28512ffcd47026 SHA1 76be0bf3dfeb7a7f1e866c377ae31e7f0f22d935 SHA256 95705aebccf37bf032960c19103200cfde37e624504fc0b56b8244a61638660d
+MISC ChangeLog 91370 RMD160 826a15064e2bb0cade86e181b48eaa6337f8ddd0 SHA1 e3ab70584b5efb2d9d2ad736f36974a4ba09dd3c SHA256 d4a6dc223e871c4a760ad9c88b4e78e27c678dda91d83f567170a9eefcf3caa8
MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
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)