- add local tslib support

Package-Manager: portage-2.1.4.5

5 files changed, 22 insertions, 9 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 241bd628ca69..98f8a55dadc2 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.365 2008/10/26 09:25:00 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.366 2008/11/01 23:40:59 solar Exp $
+
+  01 Nov 2008; <solar@gentoo.org> metadata.xml, xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.2.ebuild:
+  - add local tslib support
 
   26 Oct 2008; Rémi Cardona <remi@gentoo.org>
   +files/1.5.2-fix-xvesa-with-new-kernels.patch, xorg-server-1.5.2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 12d7025f97a1..8b2e2f089e0b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -52,7 +52,7 @@ DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69
 DIST xorg-server-1.4.2.tar.bz2 6216638 RMD160 6f12b28d7e4186dfbdec3c9116c65e6831ed2e54 SHA1 385348721ecb6da4bc51a2b7ee5784de6be0a8b6 SHA256 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
 DIST xorg-server-1.5.2.tar.bz2 5615666 RMD160 a5693c99cf2b20a94c29cfd267a0bc27626d2914 SHA1 fc8b5ed20af34f504d55a004c35ebacbc603b339 SHA256 2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18356 RMD160 6c1611797bca8b0a27b5014a361804af5eb3363a SHA1 27e910f3215676611600af2cd386246468e64088 SHA256 b6a8d2eb16ed9fc7f49f39695097cb73483892e596e67a0c2a8cbcc6c28f836c
-EBUILD xorg-server-1.4.2.ebuild 17956 RMD160 1a24c2db2530cc8234728fbdcb82f20f6aabc618 SHA1 4b127d737b67c3a8d0064d164752ab98c0e89583 SHA256 24312fec19b6ff3594bee6c18b7477b63829ec127bb62f873de6b45dfdcaef7e
-EBUILD xorg-server-1.5.2.ebuild 16404 RMD160 16172464715849bcbb43a3a1dfe4f82447e64c56 SHA1 abf43b2d4a824d903b814b46a9ae7562ee474826 SHA256 69e71ee64f48a0285415e8d9689a205f1449d99c2c4d78a8db9ed73dae4f8309
-MISC ChangeLog 88086 RMD160 90ae9f3f2a5de638a21bc64f065905df1e114d27 SHA1 31493975c0db8b389a5b15e405e86538700ca4a4 SHA256 3ec6690fa26687209569f7af3ea2f3d6d3c1abe4d9a8839282fc76c19a719e4a
-MISC metadata.xml 363 RMD160 6242c90a70b50a12d16ae53af775871766355562 SHA1 f50538064b1229c80204e9c84ff233749dd09bc5 SHA256 378597a2549cd07dd35551caf550f94f737118c40d17f9ac41eb4f5e2cfcae99
+EBUILD xorg-server-1.4.2.ebuild 18089 RMD160 33f65772d1266edb77eb60a14c094bd727001494 SHA1 9204efbb8c9040ecaba69a5899f48390c903256f SHA256 7605477f6b641c2b8d2c7e7310f2cb637de44867e702cfbf8d42d899113ad5ac
+EBUILD xorg-server-1.5.2.ebuild 16537 RMD160 1a9ba4e4c96a955cc28b7bc639da09e1b18c67e0 SHA1 0a9de225c440d60647be695e36f1fcc96044c57d SHA256 43daeee9de37fae469aa11c1e61b6ce8af167a8b847666a5b5e254383ed48ce2
+MISC ChangeLog 88218 RMD160 eb11768e64845719bf6d20ded3378456d5ad317f SHA1 f3b4faa3c5708bad101a4bed4cc227d2e443695e SHA256 d90f41743ba1a66c748a08a896a08f234dc075660df57ff0e87ffac9280a63e2
+MISC metadata.xml 415 RMD160 c2a6964201a27471fee88d04a026726ea9108ba6 SHA1 ee4d05d5b50b7466cd086680360c81db1218b745 SHA256 88741635b3a4f62bc93db2c2776a34c7a39c0848a84792ed3c435cf0d155ace9
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index cb56d8362c54..ceca1b968c53 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -5,6 +5,7 @@
 <use>
 	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
 	<flag name='kdrive'>Build the kdrive X servers</flag>
+	<flag name='tslib'>Build with tslib support</flag>
 	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index 81f795900071..18388a883de3 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.2.ebuild,v 1.6 2008/10/22 15:42:26 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.7 2008/11/01 23:40:59 solar Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -44,6 +44,7 @@ IUSE_INPUT_DEVICES="
 	input_devices_spaceorb
 	input_devices_summa
 	input_devices_tek4957
+	input_devices_tslib
 	input_devices_ur98
 	input_devices_vmmouse
 	input_devices_void
@@ -106,9 +107,10 @@ IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
-	3dfx
+	3dfx tslib
 	dri hal ipv6 minimal nptl sdl xprint"
 RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( x11-libs/tslib )
 	>=x11-libs/libXfont-1.3.1
 	>=x11-libs/xtrans-1.0.4
 	>=x11-libs/libXau-1.0.3
@@ -210,6 +212,7 @@ PDEPEND="
 		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
 		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
 		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
+		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
 		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
@@ -302,6 +305,7 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable dmx)
 		$(use_enable kdrive)
+		$(use_enable tslib)
 		$(use_enable !minimal xvfb)
 		$(use_enable !minimal xnest)
 		$(use_enable !minimal install-libxf86config)
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
index b02070ce97b6..571cadd9f0cd 100644
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.2.ebuild,v 1.7 2008/10/26 09:25:00 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.8 2008/11/01 23:40:59 solar Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -38,6 +38,7 @@ IUSE_INPUT_DEVICES="
 	input_devices_spaceorb
 	input_devices_summa
 	input_devices_tek4957
+	input_devices_tslib
 	input_devices_ur98
 	input_devices_vmmouse
 	input_devices_void
@@ -102,9 +103,10 @@ IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
-	3dfx
+	3dfx tslib
 	dri hal ipv6 minimal nptl sdl"
 RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( x11-libs/tslib )
 	>=x11-libs/libXfont-1.3.3
 	>=x11-libs/xtrans-1.2.2
 	>=x11-libs/libXau-1.0.4
@@ -203,6 +205,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_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
@@ -306,6 +309,7 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable dmx)
 		$(use_enable kdrive)
+		$(use_enable tslib)
 		$(use_enable !minimal xvfb)
 		$(use_enable !minimal xnest)
 		$(use_enable !minimal xtrap)