Version bump. Fix older versions to build against glibc-2.20, bug #544904. Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

5 files changed, 87 insertions, 9 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index be8863829be1..6dedff02bd6d 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.115 2015/03/14 14:04:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.116 2015/03/30 12:03:31 chithanh Exp $
+
+*xf86-input-synaptics-1.8.2 (30 Mar 2015)
+
+  30 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-input-synaptics-1.7-glibc-2.20.patch,
+  +xf86-input-synaptics-1.8.2.ebuild, -xf86-input-synaptics-1.7.6.ebuild,
+  xf86-input-synaptics-1.7.4.ebuild, xf86-input-synaptics-1.7.8.ebuild:
+  Version bump. Fix older versions to build against glibc-2.20, bug #544904.
+  Remove old.
 
   14 Mar 2015; Markus Meier <maekke@gentoo.org>
   xf86-input-synaptics-1.8.1.ebuild:
diff --git a/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch b/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch
new file mode 100644
index 000000000000..a599d8db4ccc
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch
@@ -0,0 +1,61 @@
+From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 29 Aug 2014 07:57:41 +1000
+Subject: Include xorg-server.h to fix build errors on newest glibc
+
+In file included from /usr/include/string.h:634:0,
+                 from /usr/include/xorg/os.h:53,
+                 from /usr/include/xorg/misc.h:115,
+                 from /usr/include/xorg/xf86str.h:37,
+                 from /usr/include/xorg/xf86Xinput.h:54,
+                 from synproto.h:36,
+                 from synproto.c:24:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
+ strndup(const char *str, size_t n);
+
+See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+diff --git a/src/eventcomm.h b/src/eventcomm.h
+index 4d759ff..e0f8743 100644
+--- a/src/eventcomm.h
++++ b/src/eventcomm.h
+@@ -27,6 +27,8 @@
+ #ifndef _EVENTCOMM_H_
+ #define _EVENTCOMM_H_
+ 
++#include <xorg-server.h>
++
+ #include <linux/input.h>
+ #include <linux/version.h>
+ #include <xf86Xinput.h>
+diff --git a/src/ps2comm.h b/src/ps2comm.h
+index 2be55e4..fa71d10 100644
+--- a/src/ps2comm.h
++++ b/src/ps2comm.h
+@@ -22,6 +22,8 @@
+ #ifndef _PS2COMM_H_
+ #define _PS2COMM_H_
+ 
++#include <xorg-server.h>
++
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "xf86_OSproc.h"
+diff --git a/src/synproto.h b/src/synproto.h
+index c52838c..6ba6740 100644
+--- a/src/synproto.h
++++ b/src/synproto.h
+@@ -31,6 +31,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <xorg-server.h>
++
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <xf86Xinput.h>
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild
index c2e8a46b3dcc..24927018b63d 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.7.4.ebuild,v 1.8 2014/06/08 09:15:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild,v 1.9 2015/03/30 12:03:31 chithanh Exp $
 
 EAPI=5
 
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "README" )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-glibc-2.20.patch
+)
+
 pkg_pretend() {
 	linux-info_pkg_setup
 	# Just a friendly warning
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.8.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.8.ebuild
index fcffa43eec0c..02f2475e9bee 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.8.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.7.8.ebuild,v 1.1 2015/02/04 17:22:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.8.ebuild,v 1.2 2015/03/30 12:03:31 chithanh Exp $
 
 EAPI=5
 
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "README" )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-glibc-2.20.patch
+)
+
 pkg_pretend() {
 	linux-info_pkg_setup
 	# Just a friendly warning
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.2.ebuild
index 93f8e02037c0..1689a224104b 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.6.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.7.6.ebuild,v 1.2 2014/05/15 11:42:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.2.ebuild,v 1.1 2015/03/30 12:03:31 chithanh Exp $
 
 EAPI=5
 
@@ -10,10 +10,10 @@ DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="kernel_linux"
 
-RDEPEND="sys-libs/mtdev
-	>=x11-base/xorg-server-1.12
+RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
+	>=x11-base/xorg-server-1.14
 	>=x11-libs/libXi-1.2
 	>=x11-libs/libXtst-1.1.0"
 DEPEND="${RDEPEND}