Version bump -- now with two finger scrolling goodness. Thanks to fuoco for his patience and his resilience, and his help. Closes bug #135512

Package-Manager: portage-2.1.1_pre2-r8

6 files changed, 196 insertions, 5 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index f0b00f21b7c4..6ee2584d96d3 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.11 2006/07/01 00:19:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.12 2006/07/12 14:11:44 seemant Exp $
+
+*synaptics-0.14.5 (12 Jul 2006)
+
+  12 Jul 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/synaptics-0.14.5-makefile-fpic.patch,
+  +files/synaptics-0.14.5-xorg-7.1-compile-fix.patch,
+  +synaptics-0.14.5.ebuild:
+  Version bump -- now with two finger scrolling goodness. Thanks to fuoco for
+  his patience and his resilience, and his help. Closes bug #135512
 
   01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
   synaptics-0.14.4-r2.ebuild:
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index 9550dd407e67..92582c8fabef 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -14,6 +14,14 @@ AUX synaptics-0.14.4-r2-makefile.patch 531 RMD160 64ac6a8bd06befe99f126a1cad0802
 MD5 7916241c4f3c3337cc1af96d450195b7 files/synaptics-0.14.4-r2-makefile.patch 531
 RMD160 64ac6a8bd06befe99f126a1cad08028c38714c8b files/synaptics-0.14.4-r2-makefile.patch 531
 SHA256 4797db102c69d06d56bdfb761308df5a2349bfa75c09383d3b67e3d6e4487ec9 files/synaptics-0.14.4-r2-makefile.patch 531
+AUX synaptics-0.14.5-makefile-fpic.patch 604 RMD160 610b6f52382cab61d669c7ed126796a7ba0c96f2 SHA1 ff235d5ea1b20a4b19a5339fc31afeb88750f8d3 SHA256 bfe89f8ecae8a0af6e8b478ed29f5fe652bf3aa6016d6c41a7a678fc25f92c36
+MD5 266f08e5619b968476661ffc5eb73fe8 files/synaptics-0.14.5-makefile-fpic.patch 604
+RMD160 610b6f52382cab61d669c7ed126796a7ba0c96f2 files/synaptics-0.14.5-makefile-fpic.patch 604
+SHA256 bfe89f8ecae8a0af6e8b478ed29f5fe652bf3aa6016d6c41a7a678fc25f92c36 files/synaptics-0.14.5-makefile-fpic.patch 604
+AUX synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249 RMD160 639955f8ae5162d4c3b4f527a6e6bb1cf4c0bb26 SHA1 0d59b2d11dbb94127ee843310e3badcaff6b61e1 SHA256 0de534613bd1df8b0b36f0387fcea858e463833bb6f4248b71c0975d7effae19
+MD5 a738ebcecae0de0a6bf827dbe5b17e2e files/synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249
+RMD160 639955f8ae5162d4c3b4f527a6e6bb1cf4c0bb26 files/synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249
+SHA256 0de534613bd1df8b0b36f0387fcea858e463833bb6f4248b71c0975d7effae19 files/synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249
 AUX synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f SHA1 985ee12c3b61cdb89c97d150a52da4df85e2f236 SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c
 MD5 f2c484f02a746852ee1295ca1f092e8d files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
@@ -21,6 +29,7 @@ SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c files/sy
 DIST synaptics-0.14.2.tar.bz2 122336
 DIST synaptics-0.14.3.tar.bz2 124189
 DIST synaptics-0.14.4.tar.bz2 125524 RMD160 9a0d22c595dfdac816251610a5c3b12c963650c0 SHA1 f6f7c39b4028efd0344d927de643efdd1d2ee649 SHA256 20cdf5884082a4072f45a7f049dfc2b0b8ad9cf24706d741def7f2a09467d43b
+DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 SHA1 54788ea58ff0c07b3ae492e8dae9a2253b586af5 SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796
 EBUILD synaptics-0.14.2.ebuild 2028 RMD160 e5c76475e4059c6155006772561582c090852f34 SHA1 6d6aec8d01ab47d0451f70c9e1f33cf4d90a929d SHA256 0ab95cfbbb56fa241ab760c6089fb6a6aeaf6be4b2a1b04d76f0ece7eb79dfac
 MD5 2a4687edaec022b5305d3ec2b019acc0 synaptics-0.14.2.ebuild 2028
 RMD160 e5c76475e4059c6155006772561582c090852f34 synaptics-0.14.2.ebuild 2028
@@ -33,10 +42,14 @@ EBUILD synaptics-0.14.4-r2.ebuild 2004 RMD160 d14571096ed050e90e0b5fda50841f3fec
 MD5 6616b2f27beaa106520f17c421615de8 synaptics-0.14.4-r2.ebuild 2004
 RMD160 d14571096ed050e90e0b5fda50841f3fec2f2aa6 synaptics-0.14.4-r2.ebuild 2004
 SHA256 2b64412f5d5f07d949fe5425eb0a6dc8a3e6bbcd6f5984b0beca03d6cc51f0f1 synaptics-0.14.4-r2.ebuild 2004
-MISC ChangeLog 11754 RMD160 d59873c73356b67b38ea31a4c4566cfce3e56303 SHA1 f59461bc0d009185510df2b9769e4a57eddd8bd5 SHA256 d3cb699d3900a1056ab3285c37b2f78c14f9ffc4bbd0b0f5c8a6723afdf3d497
-MD5 aac107351b6da40b5bd8f7286dd62ea7 ChangeLog 11754
-RMD160 d59873c73356b67b38ea31a4c4566cfce3e56303 ChangeLog 11754
-SHA256 d3cb699d3900a1056ab3285c37b2f78c14f9ffc4bbd0b0f5c8a6723afdf3d497 ChangeLog 11754
+EBUILD synaptics-0.14.5.ebuild 1472 RMD160 a9ea5041493eb55bd9280087dfa4068d805c076a SHA1 f60404389912ca8f9c439726e5e57e35b861e056 SHA256 5ba2372f89c92bce00ab3623165e53aa7e4eedb77b9d0a7f1562ff711900de27
+MD5 7f1484cdafe30b585bb8893619b63bce synaptics-0.14.5.ebuild 1472
+RMD160 a9ea5041493eb55bd9280087dfa4068d805c076a synaptics-0.14.5.ebuild 1472
+SHA256 5ba2372f89c92bce00ab3623165e53aa7e4eedb77b9d0a7f1562ff711900de27 synaptics-0.14.5.ebuild 1472
+MISC ChangeLog 12113 RMD160 a7f68b9d8700542c6470aaef7769b972b727da37 SHA1 bbda815234d0d3ef4d957f9296b33dcf458a488d SHA256 93f1ae450a8d52275c10199b2dc9b6ea910f67cb23c82db2d4753e195a025d11
+MD5 2f77022e4c40ca6fcdad43359eeda0ec ChangeLog 12113
+RMD160 a7f68b9d8700542c6470aaef7769b972b727da37 ChangeLog 12113
+SHA256 93f1ae450a8d52275c10199b2dc9b6ea910f67cb23c82db2d4753e195a025d11 ChangeLog 12113
 MISC metadata.xml 164 RMD160 5373055a0dacd7370f8f01ff476a6b76bceef186 SHA1 7b9c22cf95f8ebf5d6f244335c78af0b1d88e67a SHA256 d955cca268e81931ac6f8178cc167772f3fc4f10a1dea5a094f3c2a246883c58
 MD5 1cb923bfa5e7e99ae6804f147a1c730c metadata.xml 164
 RMD160 5373055a0dacd7370f8f01ff476a6b76bceef186 metadata.xml 164
@@ -50,3 +63,6 @@ SHA256 3dbd4bc49b7ea3d7ad63c6242ef59f83fb7280345c4904f7ad5d76cd5c5ee8d5 files/di
 MD5 de9c19102725341384275dda3c7ca6f1 files/digest-synaptics-0.14.4-r2 253
 RMD160 696a694eeb99a77465dfbc589c52e90904969779 files/digest-synaptics-0.14.4-r2 253
 SHA256 324702a3280a6fc39d42dc05c086ec77bc24646c625a86dc5eb3f2f6ff15e4ff files/digest-synaptics-0.14.4-r2 253
+MD5 d9cc3d22853a47c6e95c32842efe1057 files/digest-synaptics-0.14.5 253
+RMD160 b26b8bd28bb98319c613b3ab0502c92f7425a322 files/digest-synaptics-0.14.5 253
+SHA256 6969eb41c5136248f5548758049db81116899e04b9b15aad3207762cb68f408c files/digest-synaptics-0.14.5 253
diff --git a/x11-drivers/synaptics/files/digest-synaptics-0.14.5 b/x11-drivers/synaptics/files/digest-synaptics-0.14.5
new file mode 100644
index 000000000000..9bc140596c4e
--- /dev/null
+++ b/x11-drivers/synaptics/files/digest-synaptics-0.14.5
@@ -0,0 +1,3 @@
+MD5 aab6dc3f18344cdac7ef16e441cdc2c7 synaptics-0.14.5.tar.bz2 126743
+RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 synaptics-0.14.5.tar.bz2 126743
+SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796 synaptics-0.14.5.tar.bz2 126743
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch b/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch
new file mode 100644
index 000000000000..edd36662bb58
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.5-makefile-fpic.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2006-06-04 09:50:43.000000000 +0100
++++ Makefile	2006-06-04 09:50:53.000000000 +0100
+@@ -81,7 +81,7 @@
+ CCOPTIONS := -pedantic -Wall -Wpointer-arith
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+ CDEBUGFLAGS = -O2
+-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
++CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -fPIC
+ CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+ 
+ CC = gcc
diff --git a/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch b/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch
new file mode 100644
index 000000000000..0c2d9d104ef9
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-0.14.5-xorg-7.1-compile-fix.patch
@@ -0,0 +1,97 @@
+                                                                     
+                                                                     
+                                                                     
+                                             
+Fix compile errors when using Xorg 7.1.
+
+From: Peter Osterlund <petero2@telia.com>
+
+Initial patch from VMiklos <vmiklos@frugalware.org>. Somewhat
+modified by me.
+---
+
+ eventcomm.c |    5 +++++
+ ps2comm.h   |    1 +
+ psmcomm.c   |    2 ++
+ psmcomm.h   |    1 +
+ synaptics.c |    1 +
+ synproto.h  |    1 +
+ 6 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/eventcomm.c b/eventcomm.c
+index 6f6de7f..1b0f8bc 100644
+--- a/eventcomm.c
++++ b/eventcomm.c
+@@ -18,6 +18,11 @@
+  */
+ 
+ #include "eventcomm.h"
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <stdio.h>
+ #include "synproto.h"
+ #include "synaptics.h"
+ #include <xf86.h>
+diff --git a/ps2comm.h b/ps2comm.h
+index d6f0a25..4a1a051 100644
+--- a/ps2comm.h
++++ b/ps2comm.h
+@@ -1,6 +1,7 @@
+ #ifndef _PS2COMM_H_
+ #define _PS2COMM_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "xf86_OSproc.h"
+ 
+diff --git a/psmcomm.c b/psmcomm.c
+index e4df42b..257ec13 100644
+--- a/psmcomm.c
++++ b/psmcomm.c
+@@ -29,6 +29,8 @@
+  */
+ 
+ #include "psmcomm.h"
++#include <errno.h>
++#include <string.h>
+ #include "synproto.h"
+ #include "synaptics.h"
+ #include "ps2comm.h"			    /* ps2_print_ident() */
+diff --git a/psmcomm.h b/psmcomm.h
+index 6d64df6..a3162a2 100644
+--- a/psmcomm.h
++++ b/psmcomm.h
+@@ -1,6 +1,7 @@
+ #ifndef _PSMCOMM_H_
+ #define _PSMCOMM_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "freebsd_mouse.h"
+ 
+diff --git a/synaptics.c b/synaptics.c
+index 2a17f81..63edebb 100644
+--- a/synaptics.c
++++ b/synaptics.c
+@@ -59,6 +59,7 @@
+  *	Standard Headers
+  ****************************************************************************/
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <misc.h>
+ #include <xf86.h>
+diff --git a/synproto.h b/synproto.h
+index 8562a75..ecc4357 100644
+--- a/synproto.h
++++ b/synproto.h
+@@ -19,6 +19,7 @@
+ #ifndef _SYNPROTO_H_
+ #define _SYNPROTO_H_
+ 
++#include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <xf86Xinput.h>
+ #include <xisb.h>
diff --git a/x11-drivers/synaptics/synaptics-0.14.5.ebuild b/x11-drivers/synaptics/synaptics-0.14.5.ebuild
new file mode 100644
index 000000000000..9135a294ba04
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5.ebuild,v 1.1 2006/07/12 14:11:44 seemant Exp $
+
+inherit toolchain-funcs eutils
+
+IUSE="dlloader"
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
+SRC_URI="http://w1.894.telia.com/~u89404340/touchpad/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-base/xorg-server virtual/x11 )
+	>=sys-apps/sed-4"
+
+PREFIX="${D}/usr"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
+	then
+		epatch ${FILESDIR}/${PF}-makefile-fpic.patch
+	fi
+
+	# Compilation fix for xorg-7.1
+	epatch ${FILESDIR}/${P}-xorg-7.1-compile-fix.patch
+
+	# Switch up the CC and CFLAGS stuff.
+	sed -i \
+		-e "s:CC = gcc:CC = $(tc-getCC):g" \
+		-e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" \
+		${S}/Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
+	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd ${FILESDIR}/rc.init syndaemon
+	newconfd ${FILESDIR}/rc.conf syndaemon
+}