Version bump.

(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 14 insertions, 63 deletions

diff --git a/x11-apps/xinput/ChangeLog b/x11-apps/xinput/ChangeLog
index 70c7ab2bf20b..0130599adce4 100644
--- a/x11-apps/xinput/ChangeLog
+++ b/x11-apps/xinput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinput
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/ChangeLog,v 1.52 2013/06/05 00:42:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/ChangeLog,v 1.53 2013/09/18 21:25:13 chithanh Exp $
+
+*xinput-1.6.1 (18 Sep 2013)
+
+  18 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xinput-1.6.1.ebuild, -files/xinput-1.5.3-inputproto-2.1.patch,
+  -xinput-1.5.3-r1.ebuild, -xinput-1.5.4.ebuild:
+  Version bump.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch b/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch
deleted file mode 100644
index 632a1104883d..000000000000
--- a/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4be60c90008ac48e72e819e078ce957fd003a509 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 12 Aug 2011 04:20:21 +0000
-Subject: list: don't use defines for checking server version.
-
-Otherwise we run into the old problem again: recompiling xinput against
-newer inputproto headers will appear to change the version support,
-potentially causing errors or other misbehaviours.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/list.c b/src/list.c
-index b4649eb..b791e81 100644
---- a/src/list.c
-+++ b/src/list.c
-@@ -248,14 +248,14 @@ static int
- list_xi2(Display *display,
-          enum print_format format)
- {
--    int major = XI_2_Major,
--        minor = XI_2_Minor;
-+    int major = 2,
-+        minor = 0;
-     int ndevices;
-     int i, j;
-     XIDeviceInfo *info, *dev;
- 
-     if (XIQueryVersion(display, &major, &minor) != Success ||
--        (major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor))
-+        (major * 1000 + minor) < 2000)
-     {
-         fprintf(stderr, "XI2 not supported.\n");
-         return EXIT_FAILURE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xinput/xinput-1.5.3-r1.ebuild b/x11-apps/xinput/xinput-1.5.3-r1.ebuild
deleted file mode 100644
index 856b30accd22..000000000000
--- a/x11-apps/xinput/xinput-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.3-r1.ebuild,v 1.1 2011/12/21 19:41:42 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Utility to set XInput device parameters"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.3
-	x11-libs/libXext
-	>=x11-libs/libXi-1.4.5"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-inputproto-2.1.patch"
-)
diff --git a/x11-apps/xinput/xinput-1.5.4.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
index 1193bbf56f8d..72f28242a303 100644
--- a/x11-apps/xinput/xinput-1.5.4.ebuild
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.4.ebuild,v 1.2 2012/05/15 14:14:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.6.1.ebuild,v 1.1 2013/09/18 21:25:13 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Utility to set XInput device parameters"
@@ -12,6 +12,7 @@ IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXext
-	>=x11-libs/libXi-1.4.5"
+	>=x11-libs/libXi-1.5.99.1
+	x11-libs/libXinerama"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.0"
+	>=x11-proto/inputproto-2.1.99.1"