tslib changed the tslib-0.0.pc to tslib.pc; We check for both. Bug #304067

Package-Manager: portage-2.1.8.2/cvs/Linux x86_64

4 files changed, 21 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index d7e060285e2c..4063b46fe0eb 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.490 2010/03/15 13:01:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.491 2010/03/16 01:21:03 solar Exp $
+
+  16 Mar 2010; <solar@gentoo.org> +files/tslib-1.0-check.patch,
+  xorg-server-1.7.5.902.ebuild:
+  tslib changed the tslib-0.0.pc to tslib.pc; We check for both. Bug #304067
 
 *xorg-server-1.7.5.902 (15 Mar 2010)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cc127a0a2d79..880319c3512b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,6 +2,7 @@ AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
 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 tslib-1.0-check.patch 380 RMD160 b63c666848ace7d74c7d951cf7f050d9d980ec49 SHA1 439ac759dd56407528a700048221fbd44cd7e6e6 SHA256 4a630d17711168566f9ec129f198e7d9be21daf13b44d8c42d0a667d9c6bcc35
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
@@ -12,7 +13,7 @@ DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61fee
 EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 ea73fe68637ed109806a567347e5dbbecc56b793 SHA1 2765155c3e03a7b1cf6a7509c78264147ef15552 SHA256 2da2a9575319fee5f1d95e1b9cb458be4da148470f72c4bca85659f466b4f813
 EBUILD xorg-server-1.7.5.901.ebuild 6855 RMD160 f89a256b138c3890ade4faea6c1ad7354a03f76f SHA1 741cc130a7cd487f0dbd52d6572ab01503a02423 SHA256 7887444a3ccbdd51b57f6ab425fb021ee55a5c306484567f6d4fc29e542ffadf
-EBUILD xorg-server-1.7.5.902.ebuild 7011 RMD160 56fa5aad98efe3c1c223ceff85a367c2596cd385 SHA1 58e45704cb5c6600346e7a2f58f5a49fb7a44243 SHA256 81b2500539d81c406769262a45bae13ede37bc998db3083662adcc5efa0c09ec
+EBUILD xorg-server-1.7.5.902.ebuild 7044 RMD160 4c06e15dc663fd474b3cdeca985f8a2460bde51c SHA1 c571b1efff9be8dd6a96cddc753bb1f56e40555b SHA256 e9d247c5f7b0f29191eea97e8801d74987a344f792c81761671918593ac2e104
 EBUILD xorg-server-1.7.5.ebuild 7008 RMD160 f8c34443971a9e54e1923497232fe748a5f951e0 SHA1 b1b00b9f1b833fcd9d433e26391008d5371e9450 SHA256 8c4feccc4f43d3f70bd5e08a2471dd4bd718ba90dd9cc4a599907fbd80d4d545
-MISC ChangeLog 110752 RMD160 ddb90dbaec9014c16c8a92e4a4b1d963bb26a1ad SHA1 09a5276caf5017d5f846a654bcd3056393b4d472 SHA256 ae693ec9d792708d47590f0d48d8934a7cc2c76c80c4325dfabb20667ede2596
+MISC ChangeLog 110923 RMD160 37d6f68300c05f66bd9f07aab19314ba5fe8ec6a SHA1 cdfe9eaef8f3ad4f5087df3b51203d53a91007c3 SHA256 730354cc243d89342b0ffaf54e69cdbf2d1a2df1adb978c949f2f6932f910ff8
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/tslib-1.0-check.patch b/x11-base/xorg-server/files/tslib-1.0-check.patch
new file mode 100644
index 000000000000..fb3d3189bc3c
--- /dev/null
+++ b/x11-base/xorg-server/files/tslib-1.0-check.patch
@@ -0,0 +1,10 @@
+--- configure.ac	2010-03-16 00:52:03.000000000 +0000
++++ configure.ac	2010-03-16 00:53:30.000000000 +0000
+@@ -1913,6 +1913,7 @@
+ 
+ 
+     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
++    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"])
+     if test "x$HAVE_TSLIB" = xno; then
+         AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+     fi
diff --git a/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild
index a17408762c65..fca484086d9f 100644
--- a/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild
@@ -1,11 +1,11 @@
 # 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.5.902.ebuild,v 1.1 2010/03/15 13:01:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild,v 1.2 2010/03/16 01:21:03 solar Exp $
 
 EAPI="2"
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular multilib versionator
 
@@ -128,6 +128,7 @@ UPSTREAMED_PATCHES=(
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}/tslib-1.0-check.patch"
 	)
 
 pkg_setup() {