Replace the tslib build patch with a set of new patches in order to fix bug #318609. The first patch fixes linking with tslib whenever pkg-config fails to find it but fallback check does. The second one fixes overall linking with tslib whenever -Wl,--as-needed is used.

Package-Manager: portage-2.2_rc88_p86/cvs/Linux x86_64

10 files changed, 139 insertions, 35 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 25dfbdbcdcd7..b0704a529be5 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.540 2010/09/30 02:48:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.541 2010/10/04 20:33:59 mgorny Exp $
+
+  04 Oct 2010; Michał Górny <mgorny@gentoo.org> xorg-server-1.7.6.ebuild,
+  xorg-server-1.7.7-r1.ebuild, xorg-server-1.8.2.ebuild,
+  xorg-server-1.9.0-r2.ebuild, -files/1.7.5.902-fix-tslib-1.0-check.patch,
+  +files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch,
+  +files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch,
+  +files/xorg-server-1.7.6-tslib-as-needed.patch:
+  Replace the tslib build patch with a set of new patches in order to fix
+  bug #318609. The first patch fixes linking with tslib whenever pkg-config
+  fails to find it but fallback check does. The second one fixes overall
+  linking with tslib whenever -Wl,--as-needed is used.
 
   30 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-server-1.9.0-r2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f4c1d8ce5c8c..9db9b7d2e47c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,10 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch 1113 RMD160 2f9d636c73258b926e3a78c8ac7aaefac8afb7b6 SHA1 fe4da99464a2907cf826051d39a841f6e6be5e2b SHA256 bc0a37897d3284165aa38e281afd206ca41766a6cdadf5a157a2c137a7e93d03
+AUX 0002-Fix-linking-with-tslib-with-Wl-as-needed.patch 960 RMD160 1dea070e58b582ca93b58c9c1711db1f5bac5d20 SHA1 d3fe4bc1e82112e6e3c4c516a963ad3a23c96b22 SHA256 0ff93d361a19e9615f4551ebaf91cf9d093bec767665a48cc3274310a4da22a3
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
-AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
 AUX 1.9.0-fix-VbeModeInfoBlock-memcpy.patch 1356 RMD160 5f7a07dd12df519663f12ff4b2611aea29bfa804 SHA1 e71426eebff844b525218de50a7ab50ac1a7ee78 SHA256 87bcc800c32ac9d806973f3dcfb8ca49a73058527367b589b7a7983ee2d808cc
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
 AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70
+AUX xorg-server-1.7.6-tslib-as-needed.patch 942 RMD160 d78cde49e7725890be41eca4cb3234e487625ad3 SHA1 41c634c00dd18783a39e2e3bc2aa6342e364e1e1 SHA256 881f23f2f43f6124de202d4fd54a1ef7f505fef3965371cc6145faffa84c5547
 AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31
 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
@@ -14,9 +19,16 @@ DIST xorg-server-1.7.7-patches-01.tar.bz2 5226 RMD160 26c7cf8ebe70f61cd49bbbc46a
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
 DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
-EBUILD xorg-server-1.7.6.ebuild 7322 RMD160 b72b2bf10d0ba74e19753778c96b5c51c26a66da SHA1 71104533c101526fc9970ca6b1e9441d54f3ec40 SHA256 cea3aa755e0dec94baaa96ccd481ded3822bebfe271d88daf42ea104e4c31cb9
-EBUILD xorg-server-1.7.7-r1.ebuild 7300 RMD160 4f8bf35d3bc636292d2af32dc94319a89f41ea47 SHA1 27f859400e38af1cc9f5aef8fbf2005fa9d934f1 SHA256 3cac1655ec0674d8ca948b2a2a3a073fb65799a8a103c7cadbd34dfdbe5eaa0c
-EBUILD xorg-server-1.8.2.ebuild 8093 RMD160 fbe36989f38cb80a2b9a658501be87bdbcf63b6d SHA1 d0d480da79c28ff165aad8619ccffb5eb046dc75 SHA256 158917b024bd728191d2231d8e4a1bd93d1efc68b4ed1a293f0f1b098ac7ad79
-EBUILD xorg-server-1.9.0-r2.ebuild 7906 RMD160 b8f4095096316c98a8a862d9be209b0f6b224580 SHA1 dc3da9956278fa9ef56670f20b4e54583f0819f3 SHA256 7d1457cdb9567c2db93ffc4e81deaf0763af4c680453169ceb5cd505eb5f6b0e
-MISC ChangeLog 118871 RMD160 373e8d57712903f9ff680d3e96cff7b1e27b82c6 SHA1 0b8f89d8b480bb13bd7242d3b6ca59d369ffe910 SHA256 46adb1b66e0dea4fc60398fd08528314abdc94ccb75344e8537bfdafad35c2aa
+EBUILD xorg-server-1.7.6.ebuild 7387 RMD160 8f2efc7318211110f241f5ac1df28534ecdabfb5 SHA1 2e9f4fc70f7f5727cfd5f2eb0bc3788dc3533bf4 SHA256 2a32249e29c709743a30a73ad7dc03ca83146f6958e91614f17a526dd7fe4c1e
+EBUILD xorg-server-1.7.7-r1.ebuild 7369 RMD160 da2f86f044f5fc752666fd0db7107bd0e8e1b921 SHA1 99b106322c79895d333a9f6a228452ad0fa16c59 SHA256 71faf01c75c3df1cf1d8e6bd1a2dac382cd0814282891f2646c6f1ca2ed72856
+EBUILD xorg-server-1.8.2.ebuild 8257 RMD160 885186326c9416f17e56e41ca448b55dd1b27b04 SHA1 2b2cb027b65dbf479e786dd3a8c6c74458473b32 SHA256 2a64df0f2d87a495b8fc6133655d58ac8305b755b8427e6e1f6fdd1b7499b225
+EBUILD xorg-server-1.9.0-r2.ebuild 8077 RMD160 e907556958c38693213325d5847d6e755920c523 SHA1 138c276369416a5b5ec3ece7737a580311850ecf SHA256 a9d7db19639d64ef4ce29f66d65aeb258b1c020f94a0e81400d4c2dc86fb5400
+MISC ChangeLog 119532 RMD160 c04cb9191622ac4790c7bdf8c4a437338eda04c4 SHA1 e2a3b8c5feb4cefd0793491a9e7cb946d331f096 SHA256 f8cb93ca7bab4f4b597cbfbb60c2c7cd57bf1df1f3fc7a30c8b3e2bc929e329b
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyqOjIACgkQnGSe5QXeB7vZuQCdFMzl5OzFj/g574q75gapIY+G
+PA8AoLmOqgRd1xOcAKcP9RHbhHPJu7EE
+=Qs1j
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch b/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
new file mode 100644
index 000000000000..8538bf35f302
--- /dev/null
+++ b/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
@@ -0,0 +1,35 @@
+From 7cf37a8247205335657dd7a644856bbaf619b7ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Oct 2010 18:38:44 +0200
+Subject: [PATCH 1/2] Fix tslib check fallback to set TSLIB_LIBS.
+
+If pkg-config is unable to find tslib but the fallback check does find
+it, the compilation continues with tslib support enabled though
+TSLIB_LIBS is unset. Thus, the compilation fails with a linking error on
+tslib functions.
+
+This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check
+succeds.
+---
+ configure.ac |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c0bf98f..6d63663 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then
+ 
+     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+     if test "x$HAVE_TSLIB" = xno; then
+-        AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
++        AC_CHECK_LIB(ts, ts_open, [
++			HAVE_TSLIB="yes"
++			TSLIB_LIBS="-lts"
++		])
+     fi
+ 
+     if test "xTSLIB" = xauto; then
+-- 
+1.7.3.1
+
diff --git a/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch b/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
new file mode 100644
index 000000000000..cdcfca6fdf81
--- /dev/null
+++ b/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
@@ -0,0 +1,25 @@
+From 39193982958d8e3c433f32d834912129e360d377 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Oct 2010 19:02:29 +0200
+Subject: [PATCH 2/2] Fix linking with tslib, with -Wl,--as-needed.
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6d63663..e8f9473 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2122,7 +2122,7 @@ if test "$KDRIVE" = yes; then
+     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+-    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
++    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
+ 
+     AC_SUBST([XEPHYR_LIBS])
+     AC_SUBST([XEPHYR_INCS])
+-- 
+1.7.3.1
+
diff --git a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
deleted file mode 100644
index 3675822edf28..000000000000
--- a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac	2010-03-16 22:24:14.000000000 +0100
-+++ configure.ac.new	2010-03-16 22:33:10.000000000 +0100
-@@ -1915,8 +1915,14 @@
-         AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
-     fi
- 
--
--    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
-+    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
-+        PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
-+           	PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
-+		    HAVE_TSLIB="no"
-+		])
-+	])
-+    ])
-     if test "x$HAVE_TSLIB" = xno; then
-         AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
-     fi
diff --git a/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch b/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch
new file mode 100644
index 000000000000..6e1b3e59401c
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch
@@ -0,0 +1,25 @@
+From c5eeb329f06a3c58704351261f8633c0ed753f18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Oct 2010 19:02:29 +0200
+Subject: [PATCH] Fix linking with tslib, with -Wl,--as-needed.
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4408e86..47df6c3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1981,7 +1981,7 @@ if test "$KDRIVE" = yes; then
+     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+-    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
++    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $TSLIB_LIBS"
+ 
+     AC_SUBST([XEPHYR_LIBS])
+     AC_SUBST([XEPHYR_INCS])
+-- 
+1.7.3.1
+
diff --git a/x11-base/xorg-server/xorg-server-1.7.6.ebuild b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
index b8ac1d0e76a3..1c37b5bf9cfd 100644
--- a/x11-base/xorg-server/xorg-server-1.7.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7.6.ebuild,v 1.11 2010/09/05 11:59:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v 1.12 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI="2"
 
@@ -126,12 +126,14 @@ UPSTREAMED_PATCHES=(
 
 	# Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
 	"${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
-	# Fix for bug #304067
-	"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
 	)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/${P}-tslib-as-needed.patch
 	)
 
 pkg_setup() {
diff --git a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
index df445c825109..7cb1fdce1f69 100644
--- a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7.7-r1.ebuild,v 1.9 2010/09/26 19:03:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.10 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI="2"
 
@@ -126,13 +126,15 @@ EPATCH_SUFFIX="patch"
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
 	"${WORKDIR}/patches/"
-	# Fix for bug #304067
-	"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
 	"${FILESDIR}"/${PN}-1.8-nouveau-default.patch
 	)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/${PN}-1.7.6-tslib-as-needed.patch
 	)
 
 pkg_setup() {
diff --git a/x11-base/xorg-server/xorg-server-1.8.2.ebuild b/x11-base/xorg-server/xorg-server-1.8.2.ebuild
index 86bbf9e6cf60..6943dea21df3 100644
--- a/x11-base/xorg-server/xorg-server-1.8.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.8.2.ebuild,v 1.2 2010/09/05 11:59:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild,v 1.3 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -104,6 +104,10 @@ PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.8-nouveau-default.patch
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
 	)
 
 pkg_setup() {
diff --git a/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild b/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild
index 3bcefa478a1b..f3094a7ff11f 100644
--- a/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.9.0-r2.ebuild,v 1.2 2010/09/30 02:48:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild,v 1.3 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI=3
 inherit xorg-2 multilib versionator
@@ -105,8 +105,11 @@ PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
-	"${FILESDIR}"/1.7.5.902-fix-tslib-1.0-check.patch
 	"${FILESDIR}"/1.9.0-fix-VbeModeInfoBlock-memcpy.patch
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
 	)
 
 pkg_setup() {
@@ -153,6 +156,10 @@ pkg_setup() {
 		--with-os-vendor=Gentoo
 		${conf_opts}"
 
+	if use kdrive && use tslib; then
+		XORG_EAUTORECONF=yes
+	fi
+
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
 	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this