Synaptics 1.5.0 is in portage tree, drop this

7 files changed, 0 insertions, 428 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
deleted file mode 100644
index f771731..0000000
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-# ChangeLog for x11-drivers/xf86-input-synaptics
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*xf86-input-synaptics-1.4.0-r2 (09 Mar 2011)
-
-  09 Mar 2011; <egore911@egore911.de> +xf86-input-synaptics-1.4.0-r2.ebuild,
-  +files/synaptics-1.4.0-evdev-configuration.patch:
-  Add patch to include only /dev/input/event* devices on linux and no
-  longer the duplicated /dev/input/mouse* ones. Fixes #345981
-
-*xf86-input-synaptics-1.4.0-r1 (09 Mar 2011)
-
-  09 Mar 2011; <egore911@egore911.de>
-  +files/0001-Add-synaptics-orientation-patch.patch,
-  +xf86-input-synaptics-1.4.0-r1.ebuild, +metadata.xml:
-  Use upstream patch to fix #296084
-
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
deleted file mode 100644
index 38207cc..0000000
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0001-Add-synaptics-orientation-patch.patch 10860 RMD160 e6b6406411855fd175160047f16fcb0e6b52f3d6 SHA1 a6ad88e61602709f72d258a6829439fee1e6e096 SHA256 f4454e44eb738ffab754fa080df9dc45579fcca936513400856d1ebcd5e983c0
-AUX synaptics-1.4.0-evdev-configuration.patch 302 RMD160 d07c6300985294c486bb7afd8d8baea0f5eadf07 SHA1 03cf7af84746ceed1c707fcf1b7bc859670f2556 SHA256 b6096ae349ec21219d982618595a9690a5483e81b387bb6541a0587f6354a495
-DIST xf86-input-synaptics-1.4.0.tar.bz2 395776 RMD160 e2fc6bc6de627e507dc0ff923b433862e4d36659 SHA1 96541b063482568e177f883a9fcfbe9a22c25569 SHA256 5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2
-EBUILD xf86-input-synaptics-1.4.0-r1.ebuild 1058 RMD160 12beef5322c236bd0466bd0fd64e71d377f98562 SHA1 4888722027c171fd4cb973c67bce0f3e43e6d85b SHA256 8e026d85155ecd61f775576887be7b0c1b4d6bb8d01e3a5e78758485e95d4619
-EBUILD xf86-input-synaptics-1.4.0-r2.ebuild 1231 RMD160 1a88caf97ad6329668bdf03374f447816663cb73 SHA1 286a053197d42673b476ad1cde984ebea41fe047 SHA256 30789ba0d14ccbcad51c6fe8959e9b2ae5435fb395a892b2dbeba61c01e5f5c7
-MISC ChangeLog 671 RMD160 dd8d06595a4f44b4572f1d8ae70420f241c844c1 SHA1 2b780a257ea5c6800c18e9a36645a8153d36b2cd SHA256 7fbe0864de5d76aee8fd44c45987a4f95c88afea3eb01084963c10cac7660c4e
-MISC metadata.xml 225 RMD160 4c506d7c9b24eec779d50ce5ede69834a7f6178a SHA1 a318096995ed1f48d6657e4b08a13371852b12de SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655
diff --git a/x11-drivers/xf86-input-synaptics/files/0001-Add-synaptics-orientation-patch.patch b/x11-drivers/xf86-input-synaptics/files/0001-Add-synaptics-orientation-patch.patch
deleted file mode 100644
index 4466748..0000000
--- a/x11-drivers/xf86-input-synaptics/files/0001-Add-synaptics-orientation-patch.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From a4adb570ccc779cf03b6943fd3a90093845c0e86 Mon Sep 17 00:00:00 2001
-From: Aapo Rantalainen <aapo.rantalainen@gmail.com>
-Date: Wed, 9 Mar 2011 21:32:36 +0100
-Subject: [PATCH] Add synaptics orientation patch
-
-This patch allows usage of "synclient Orientation=0" (values from 0 to
-3). It will rotate the touchpad similar to "xrandr -o". Original patch
-was extended for alps and ps2.
-
-Signed-off-by: Christoph Brill <egore911@egore911.de>
----
- include/synaptics-properties.h |    3 +++
- man/synaptics.man              |    6 ++++++
- src/alpscomm.c                 |   29 +++++++++++++++++++++++++----
- src/eventcomm.c                |   22 ++++++++++++++++++++--
- src/properties.c               |    8 ++++++++
- src/ps2comm.c                  |   36 +++++++++++++++++++++++++++++-------
- src/synaptics.c                |    2 ++
- src/synapticsstr.h             |    1 +
- tools/synclient.c              |    1 +
- 9 files changed, 95 insertions(+), 13 deletions(-)
-
-diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
-index bdb2112..0b4e570 100644
---- a/include/synaptics-properties.h
-+++ b/include/synaptics-properties.h
-@@ -158,4 +158,7 @@
- /* 32 Bit Integer, 2 values, horizontal hysteresis, vertical hysteresis */
- #define SYNAPTICS_PROP_NOISE_CANCELLATION "Synaptics Noise Cancellation"
- 
-+/* 32 bit, 4 values, normal, inverted, left, right */
-+#define SYNAPTICS_ORIENTATION "Synaptics Orientation"
-+
- #endif /* _SYNAPTICS_PROPERTIES_H_ */
-diff --git a/man/synaptics.man b/man/synaptics.man
-index 0a35883..44d1c27 100644
---- a/man/synaptics.man
-+++ b/man/synaptics.man
-@@ -510,6 +510,12 @@ AreaBottomEdge option to any integer value other than zero. If supported by the
- server (version 1.9 and later), the edge may be specified in percent of
- the total height of the touchpad. Property: "Synaptics Area"
- .
-+.TP
-+.BI "Option \*qOrientation\*q \*q" integer \*q
-+Rotate the touchpad similar to xrandr -o.
-+.
-+The orientation can be 0 (normal), 1(left), 2 (inverted) or 3(right).
-+.
- 
- .SH CONFIGURATION DETAILS
- .SS Area handling
-diff --git a/src/alpscomm.c b/src/alpscomm.c
-index dc76655..7d5cda2 100644
---- a/src/alpscomm.c
-+++ b/src/alpscomm.c
-@@ -149,11 +149,12 @@ ALPS_get_packet(struct CommData *comm, InputInfoPtr pInfo)
-  * reflects left,right,down,up in lef1,rig1,mid1,up1.
-  */
- static void
--ALPS_process_packet(unsigned char *packet, struct SynapticsHwState *hw)
-+ALPS_process_packet(SynapticsPrivate *priv, unsigned char *packet, struct SynapticsHwState *hw)
- {
-     int x = 0, y = 0, z = 0;
-     int left = 0, right = 0, middle = 0;
-     int i;
-+    SynapticsParameters *para = &priv->synpara;
- 
-     x = (packet[1] & 0x7f) | ((packet[2] & 0x78) << (7-3));
-     y = (packet[4] & 0x7f) | ((packet[3] & 0x70) << (7-4));
-@@ -172,8 +173,27 @@ ALPS_process_packet(unsigned char *packet, struct SynapticsHwState *hw)
- 	hw->multi[i] = FALSE;
- 
-     if (z > 0) {
--	hw->x = x;
--	hw->y = y;
-+	if (para->orientation==0)
-+	    hw->x = x;
-+	else if (para->orientation==2)
-+	    hw->x = priv->maxx + priv->minx - x;
-+	else if (para->orientation==3)
-+	    hw->y = (priv->maxx - x) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+	else if (para->orientation==1)
-+	    hw->y = (x - priv->minx) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+	else
-+	    hw->x = x;
-+
-+	if (para->orientation==0)
-+	    hw->y = y;
-+	else if (para->orientation==2)
-+	    hw->y = priv->maxy + priv->miny - y;
-+	else if (para->orientation==3)
-+	    hw->x = (y - priv->miny) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+	else if (para->orientation==1)
-+	    hw->x = (priv->maxy - y) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+	else
-+	    hw->y = y;
-     }
-     hw->z = z;
-     hw->numFingers = (z > 0) ? 1 : 0;
-@@ -210,11 +230,12 @@ ALPSReadHwState(InputInfoPtr pInfo,
- {
-     unsigned char *buf = comm->protoBuf;
-     struct SynapticsHwState *hw = &(comm->hwState);
-+    SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
- 
-     if (!ALPS_get_packet(comm, pInfo))
- 	return FALSE;
- 
--    ALPS_process_packet(buf, hw);
-+    ALPS_process_packet(priv, buf, hw);
- 
-     *hwRet = *hw;
-     return TRUE;
-diff --git a/src/eventcomm.c b/src/eventcomm.c
-index d394d3f..3d550f1 100644
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
-@@ -400,10 +400,28 @@ EventReadHwState(InputInfoPtr pInfo,
- 	case EV_ABS:
- 	    switch (ev.code) {
- 	    case ABS_X:
--		hw->x = ev.value;
-+		if (para->orientation==0)
-+		    hw->x = ev.value;
-+		else if (para->orientation==2)
-+		    hw->x = priv->maxx + priv->minx - ev.value;
-+		else if (para->orientation==3)
-+		    hw->y = (priv->maxx - ev.value) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+		else if (para->orientation==1)
-+		    hw->y = (ev.value - priv->minx) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+		else
-+		    hw->x = ev.value;
- 		break;
- 	    case ABS_Y:
--		hw->y = ev.value;
-+		if (para->orientation==0)
-+		    hw->y = ev.value;
-+		else if (para->orientation==2)
-+		    hw->y = priv->maxy + priv->miny - ev.value;
-+		else if (para->orientation==3)
-+		    hw->x = (ev.value - priv->miny) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+		else if (para->orientation==1)
-+		    hw->x = (priv->maxy - ev.value) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+		else
-+		    hw->y = ev.value;
- 		break;
- 	    case ABS_PRESSURE:
- 		hw->z = ev.value;
-diff --git a/src/properties.c b/src/properties.c
-index 23b5a6a..06909ed 100644
---- a/src/properties.c
-+++ b/src/properties.c
-@@ -83,6 +83,7 @@ Atom prop_capabilities          = 0;
- Atom prop_resolution            = 0;
- Atom prop_area                  = 0;
- Atom prop_noise_cancellation    = 0;
-+Atom prop_orientation           = 0;
- 
- static Atom
- InitAtom(DeviceIntPtr dev, char *name, int format, int nvalues, int *values)
-@@ -285,6 +286,8 @@ InitDeviceProperties(InputInfoPtr pInfo)
-     prop_noise_cancellation = InitAtom(pInfo->dev,
-             SYNAPTICS_PROP_NOISE_CANCELLATION, 32, 2, values);
- 
-+    prop_orientation = InitAtom(pInfo->dev, SYNAPTICS_ORIENTATION, 32, 1, &para->orientation);
-+
- }
- 
- int
-@@ -666,6 +669,11 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
-             return BadValue;
-         para->hyst_x = hyst[0];
-         para->hyst_y = hyst[1];
-+    } else if (property == prop_orientation)
-+    {
-+        if (prop->size != 1 || prop->format != 32 || prop->type != XA_INTEGER)
-+            return BadMatch;
-+        para->orientation = *(INT32*)prop->data;
-     }
- 
-     return Success;
-diff --git a/src/ps2comm.c b/src/ps2comm.c
-index 0e9b861..1c2bbc3 100644
---- a/src/ps2comm.c
-+++ b/src/ps2comm.c
-@@ -524,7 +524,7 @@ PS2ReadHwStateProto(InputInfoPtr pInfo,
-     SynapticsParameters *para = &priv->synpara;
-     struct PS2SynapticsHwInfo *synhw;
-     int newabs;
--    int w, i;
-+    int w, i, x, y;
- 
-     synhw = (struct PS2SynapticsHwInfo*)priv->proto_data;
-     if (!synhw)
-@@ -541,17 +541,17 @@ PS2ReadHwStateProto(InputInfoPtr pInfo,
- 	return FALSE;
- 
-     /* Handle normal packets */
--    hw->x = hw->y = hw->z = hw->numFingers = hw->fingerWidth = 0;
-+    hw->x = hw->y = hw->z = hw->numFingers = hw->fingerWidth = x = y = 0;
-     hw->left = hw->right = hw->up = hw->down = hw->middle = FALSE;
-     for (i = 0; i < 8; i++)
- 	hw->multi[i] = FALSE;
- 
-     if (newabs) {			    /* newer protos...*/
- 	DBG(7, "using new protocols\n");
--	hw->x = (((buf[3] & 0x10) << 8) |
-+	x = (((buf[3] & 0x10) << 8) |
- 		 ((buf[1] & 0x0f) << 8) |
- 		 buf[4]);
--	hw->y = (((buf[3] & 0x20) << 7) |
-+	y = (((buf[3] & 0x20) << 7) |
- 		 ((buf[1] & 0xf0) << 4) |
- 		 buf[5]);
- 
-@@ -598,9 +598,9 @@ PS2ReadHwStateProto(InputInfoPtr pInfo,
- 	}
-     } else {			    /* old proto...*/
- 	DBG(7, "using old protocol\n");
--	hw->x = (((buf[1] & 0x1F) << 8) |
-+	x = (((buf[1] & 0x1F) << 8) |
- 		 buf[2]);
--	hw->y = (((buf[4] & 0x1F) << 8) |
-+	y = (((buf[4] & 0x1F) << 8) |
- 		 buf[5]);
- 
- 	hw->z = (((buf[0] & 0x30) << 2) |
-@@ -612,7 +612,29 @@ PS2ReadHwStateProto(InputInfoPtr pInfo,
- 	hw->right = (buf[0] & 0x02) ? 1 : 0;
-     }
- 
--    hw->y = YMAX_NOMINAL + YMIN_NOMINAL - hw->y;
-+    y = YMAX_NOMINAL + YMIN_NOMINAL - y;
-+
-+    if (para->orientation==0)
-+	hw->x = x;
-+    else if (para->orientation==2)
-+	hw->x = priv->maxx + priv->minx - x;
-+    else if (para->orientation==3)
-+	hw->y = (priv->maxx - x) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+    else if (para->orientation==1)
-+	hw->y = (x - priv->minx) * (priv->maxy - priv->miny) / (priv->maxx - priv->minx) + priv->miny;
-+    else
-+	hw->x = x;
-+
-+    if (para->orientation==0)
-+	hw->y = y;
-+    else if (para->orientation==2)
-+	hw->y = priv->maxy + priv->miny - y;
-+    else if (para->orientation==3)
-+	hw->x = (y - priv->miny) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+    else if (para->orientation==1)
-+	hw->x = (priv->maxy - y) * (priv->maxx - priv->minx) / (priv->maxy - priv->miny) + priv->minx;
-+    else
-+	hw->y = y;
- 
-     if (hw->z >= para->finger_high) {
- 	int w_ok = 0;
-diff --git a/src/synaptics.c b/src/synaptics.c
-index 1233917..03a9f60 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -574,6 +574,8 @@ static void set_default_parameters(InputInfoPtr pInfo)
-     pars->resolution_horiz = xf86SetIntOption(opts, "HorizResolution", horizResolution);
-     pars->resolution_vert = xf86SetIntOption(opts, "VertResolution", vertResolution);
- 
-+    pars->orientation = xf86SetIntOption(opts, "Orientation", 0);
-+
-     /* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */
-     if (pars->top_edge > pars->bottom_edge) {
- 	int tmp = pars->top_edge;
-diff --git a/src/synapticsstr.h b/src/synapticsstr.h
-index 8f6593e..90640f7 100644
---- a/src/synapticsstr.h
-+++ b/src/synapticsstr.h
-@@ -161,6 +161,7 @@ typedef struct _SynapticsParameters
-     unsigned int resolution_vert;           /* vertical resolution of touchpad in units/mm */
-     int area_left_edge, area_right_edge, area_top_edge, area_bottom_edge; /* area coordinates absolute */
-     int hyst_x, hyst_y;                     /* x and y width of hysteresis box */
-+    int orientation;                        /* orientation of the touchpad */
- } SynapticsParameters;
- 
- 
-diff --git a/tools/synclient.c b/tools/synclient.c
-index 9776d23..1ac5502 100644
---- a/tools/synclient.c
-+++ b/tools/synclient.c
-@@ -143,6 +143,7 @@ static struct Parameter params[] = {
-     {"AreaRightEdge",         PT_INT,    0, 10000, SYNAPTICS_PROP_AREA,	32,	1},
-     {"AreaTopEdge",           PT_INT,    0, 10000, SYNAPTICS_PROP_AREA,	32,	2},
-     {"AreaBottomEdge",        PT_INT,    0, 10000, SYNAPTICS_PROP_AREA,	32,	3},
-+    {"Orientation",           PT_INT,    0, 3,     SYNAPTICS_ORIENTATION, 32,   0},
-     { NULL, 0, 0, 0, 0 }
- };
- 
--- 
-1.7.4.1
-
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-1.4.0-evdev-configuration.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-1.4.0-evdev-configuration.patch
deleted file mode 100644
index 7a13009..0000000
--- a/x11-drivers/xf86-input-synaptics/files/synaptics-1.4.0-evdev-configuration.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- conf/50-synaptics.conf.orig	2011-03-09 23:38:30.313000103 +0100
-+++ conf/50-synaptics.conf	2011-03-09 23:38:38.757000071 +0100
-@@ -2,4 +2,5 @@
-         Identifier "touchpad catchall"
-         Driver "synaptics"
-         MatchIsTouchpad "on"
-+        MatchDevicePath "/dev/input/event*"
- EndSection
diff --git a/x11-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml
deleted file mode 100644
index 3154a6a..0000000
--- a/x11-drivers/xf86-input-synaptics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>egore911@egore911.de</email>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r1.ebuild
deleted file mode 100644
index c9c1fc2..0000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild,v 1.1 2011/03/04 23:05:33 scarabeus Exp $
-
-EAPI=4
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-base/xorg-server-1.8
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	>=x11-proto/recordproto-1.14"
-
-DOCS=( "README" )
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Add-synaptics-orientation-patch.patch
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r2.ebuild
deleted file mode 100644
index d5f8ef8..0000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild,v 1.1 2011/03/04 23:05:33 scarabeus Exp $
-
-EAPI=4
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-base/xorg-server-1.8
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	>=x11-proto/recordproto-1.14"
-
-DOCS=( "README" )
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Add-synaptics-orientation-patch.patch
-	local host=${CTARGET:-${CHOST}}
-	case ${host} in
-		*-linux-*|*-linux)
-			epatch "${FILESDIR}"/synaptics-${PV}-evdev-configuration.patch ;;
-		*)
-		    elog "Not here"
-	esac
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-}