- Bug 319147 avoid conflicting headers : Marat Radchenko <marat@slonopotamus.org>

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 71 insertions, 2 deletions

diff --git a/x11-drivers/xf86-input-tslib/ChangeLog b/x11-drivers/xf86-input-tslib/ChangeLog
index ec8f82977aac..dc5493aca0f5 100644
--- a/x11-drivers/xf86-input-tslib/ChangeLog
+++ b/x11-drivers/xf86-input-tslib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-tslib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-tslib/ChangeLog,v 1.26 2010/06/04 13:58:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-tslib/ChangeLog,v 1.27 2010/07/11 03:18:50 solar Exp $
+
+*xf86-input-tslib-0.0.6-r2 (11 Jul 2010)
+
+  11 Jul 2010; <solar@gentoo.org> +xf86-input-tslib-0.0.6-r2.ebuild,
+  +files/fix-overlapped-variable.patch:
+  - Bug 319147 avoid conflicting headers : Marat Radchenko
+  <marat@slonopotamus.org>
 
   31 May 2010; Guy Martin <gmsoft@gentoo.org>
   xf86-input-tslib-0.0.6-r1.ebuild:
diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index e6b1dcff8025..3f9288bb59fe 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -1,7 +1,9 @@
+AUX fix-overlapped-variable.patch 485 RMD160 e4dcdd590b13d530131c0a52b6ae296777ae7f6f SHA1 340647621ffe72a8dc148dfc629c9556c7ab6a16 SHA256 d149611a62e9d6de547403bfcf8770fe1c8e87dd39d3ba22f42805dadcfd1978
 DIST xf86-input-tslib-0.0.5.tar.bz2 226648 RMD160 a7a2d64afbbd816c0107ca285bed148f84c5be10 SHA1 fa87a543e2a3d7a4aec56d1f85d731e0fcf8daab SHA256 d70c64f3f4fe931e12d5af7f91ff04cd0d16dd7459061c50b3149f9e35de8091
 DIST xf86-input-tslib_0.0.5-6.diff.gz 19656 RMD160 23afb83800960e05ec94e8f3917e0fe6a3ec5cef SHA1 77a6a9566f33248e515373cf67f3bb7e6087a4a1 SHA256 c0f2f6cebb78c3b69d75c12051e0bb03ffc1c41aaca7aef02562211441eb658b
 DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 RMD160 dbd81e0d6168ea6694756bebf6dbe5d972d71a0c SHA1 708c91cfc16f7f04d2d639addb424aae686037cd SHA256 546083a3d70b0da4403fb2add28036ed48f6a91adb802044ac0e4f3bcbc429f5
 EBUILD xf86-input-tslib-0.0.5-r1.ebuild 1298 RMD160 b2baf02e3025b6827b1f5c6a783a53dfe448bd0d SHA1 2376cb4aa14a518a1c7c180e310e6744f80cc0b0 SHA256 3797a63998a10f74b787a9761a8c36c8c788d72c96fdc96ba8d27ad90eb1135f
 EBUILD xf86-input-tslib-0.0.6-r1.ebuild 1080 RMD160 6a1f780f59077fa3b3f4af155b0256d41442bc8c SHA1 b69dcaa9e0c5993bd71f286236167e1ebbf4e7d3 SHA256 a1ef3acbf086b657df739a6c33b17b5e0e2bb3ec8cf241ee5bf41f21a964ba35
-MISC ChangeLog 3735 RMD160 4bc56adaabf4836afe856e2a0cd0fec5d3c0d577 SHA1 d7c58e2572af70850915552e9200e369dbf20182 SHA256 3b26456ac1e412587df176959109d09e34fa774025c652b8634929d2c4d3c120
+EBUILD xf86-input-tslib-0.0.6-r2.ebuild 1163 RMD160 cbbbb95362d621ebc6b1ad7343fb02e48344d440 SHA1 c68e0a68baedd6f0146de9a5210d4fc0460a565a SHA256 41fbff4322e35fd40ec5eabf22d94d0d8b88089879c2eb344835fac5fabd165b
+MISC ChangeLog 3972 RMD160 3c837ef55c400313e05544cefe08d56599cbfd31 SHA1 a865be2db34f4a1c0743d1cca26050a50c63d4f1 SHA256 cb65dc2264b24985cc5444e6fdfbe50e97a82638d62c022dc8cbeec7ff04cfad
 MISC metadata.xml 363 RMD160 9829563a3262c5153fd253a69e44707b05b65ee0 SHA1 1f96a02d0999443354264764e483f696a04f56f8 SHA256 bd50ec4a36c95aed7657ad9e58447e64a9548261c6f2bf3888dd1d2689a4694c
diff --git a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
new file mode 100644
index 000000000000..7a4363e97277
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
@@ -0,0 +1,20 @@
+--- src/tslib.c.orig	2010-05-19 19:01:01.000000000 +0200
++++ src/tslib.c	2010-05-19 19:02:00.000000000 +0200
+@@ -543,7 +543,7 @@
+ 	return (pInfo);
+ }
+ 
+-_X_EXPORT InputDriverRec TSLIB = {
++_X_EXPORT InputDriverRec TSLIB_DRIVER = {
+ 	1,			/* driver version */
+ 	"tslib",		/* driver name */
+ 	NULL,			/* identify */
+@@ -580,7 +580,7 @@
+ {
+ 	static Bool Initialised = FALSE;
+ 
+-	xf86AddInputDriver(&TSLIB, module, 0);
++	xf86AddInputDriver(&TSLIB_DRIVER, module, 0);
+ 
+ 	return module;
+ }
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..dfaf7c270d12
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild,v 1.1 2010/07/11 03:18:50 solar Exp $
+
+EAPI=2
+
+# Based on xf86-input-synaptics ebuild
+inherit toolchain-funcs eutils linux-info x-modular
+
+PATCHLEVEL=3
+DEBSOURCES="${PN}_${PV}-${PATCHLEVEL}.tar.gz"
+
+DESCRIPTION="xorg input driver for use of tslib based touchscreen devices"
+HOMEPAGE="http://www.pengutronix.de/software/xf86-input-tslib/index_en.html"
+SRC_URI="ftp://cdn.debian.net/debian/pool/main/x/${PN}/${DEBSOURCES}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server
+	x11-libs/tslib"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto"
+
+S=${WORKDIR}/${PN}-trunk
+
+# Remove stupid evdev checks.
+# Never die simply cuz kernel sources do not exist.
+
+src_install() {
+	DOCS="COPYING ChangeLog"
+	x-modular_src_install
+	insinto /usr/share/hal/fdi/policy/20thirdparty/
+	doins "${S}/debian/10-x11-input-tslib.fdi"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-overlapped-variable.patch
+}