Version bump.

Package-Manager: portage-2.2.1/cvs/Linux x86_64

5 files changed, 17 insertions, 89 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/Manifest b/x11-apps/xinput/Manifest
index 0ef4868080c7..dff87087b4d8 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,29 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX xinput-1.5.3-inputproto-2.1.patch 1174 SHA256 34b51cc3bd6b9b1a48220b3bcdf4680bed243439ba5e1a21fbb27ba268e6301c SHA512 6259f85cb2cd58a2bb30b6b5f14097a7af1fbaf72e9f1f5e194ab5914e69fe83120a0a419d05f47a48dc0aa2547238b105d983eeecbae82c3afcf3dcb4eb3b8c WHIRLPOOL 45531fbc3c07c420fed1c05f3d19c77deabcb55ffb92cbdd23f3352c9addd2bdd0156d680e31b9b84c2d7ff9740b8e27eb10ee87eee43682c216d5bc556a9048
-DIST xinput-1.5.3.tar.bz2 131585 SHA256 6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76 SHA512 b6f389d5b1fe63de006d90da54824628be9407bf961ffa33ccc2f4080c7aed6e7c8dfe01b7289d6077d80b3d565d2cf9fa60578cc51793135e66e7066606b4b7 WHIRLPOOL acbf3106fa1ac748234c2c29d83d057fd231a576b5cfaaa7a140c5b68f633d5cfefa23a6a5bf514d40cc29a5cd9d61b5cb3daad95c4ce0884b559bcee67cf53d
-DIST xinput-1.5.4.tar.bz2 134702 SHA256 a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
 DIST xinput-1.6.0.tar.bz2 146209 SHA256 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e SHA512 e07d8f8b213cf97dc840319fb3ce6f1df2d4dff0bcc04af285bdca50c2d1d4aaf6105fe4846bb42b58e6e582e2fd93e850ebfb703fae3513ebd6b0247aa02987 WHIRLPOOL dace6f1cb98ca206478b1432f06c8f010c69554652e43853f1d506bee54dbaccbd836d371ab28b04f0235f2e5cae2a943ab6710928ad5ee8e584c19abe2c8830
-EBUILD xinput-1.5.3-r1.ebuild 572 SHA256 6ec09c02bce78f5af90180ce3e01747e203d75ee402f128efef35b6ff510aaf5 SHA512 be875520f0ad000afdf41c3f9014ed45565966605deabb694e0eb41badab27af9cc356a939d932f6c8e34bdc2380bb0a9953ab5dbb42d4ed2f19b6aebf070595 WHIRLPOOL 57c200b658c1cbb06eef1b6039c7989315a8598656186d863083e3ddf41a7c8388d561c3ea17571576ce5ddeb60e18e7ac774e470c7502d41d2d6a8062616f3c
-EBUILD xinput-1.5.4.ebuild 527 SHA256 57f147e2b6a2267eb5ab7ba885e974e106d604bb5eb6ade68dfd094b0bbfe883 SHA512 94277299d0b696f7d54767dfe98e8b5626f1657483921f17e5a8f46bb39a94c5d9d55aee00d758558425d7495997930d8f9de1d0527f80d52ec79f9a6231ee84 WHIRLPOOL 31192ac9bf3d202253a541a327429e5f84dd075032436faf495f0044675d7e7ad54a5deb9105f0b4e028496d5a17bc963f9aa9396de75ff15552e5dc97369755
+DIST xinput-1.6.1.tar.bz2 152587 SHA256 b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a WHIRLPOOL 14d9da0390d5b40cc81fe6934554ec52d5be74d008a9c23504df7acdeef64cb17e11849445dd1cc21b931f46dd49e8f56769955a9ed611fa560d58e67caadb62
 EBUILD xinput-1.6.0.ebuild 546 SHA256 7d75e4a874661835a9c8700acc2e14cda17cc2ad9f2470189661ce0238936bce SHA512 14d32db8d5b2a38fd8c0f241ec8dd99c3956ee8c3713157270d9fe43514be9a70a54ca0c85dc52e88f623090fce3fa0daea169289e2de853396b04286a31315a WHIRLPOOL 1778991b930329a07a2d72d347fd1f6eb1dbdbc99165095b580fe328bacc1dd405e62f1ca50c3dfa37bbebeab7bdf7b93571a3437a16470495eeb8a8f403e27d
-MISC ChangeLog 9392 SHA256 80961ed6de67f39af153a8872d34e4c8820d3abb6e786442afff310191405fb4 SHA512 fb0c21cf2c8820a18b8c6afc23a924224f097812992a84c60dd7dd70824b677a9ff3d9a709f0baa14d5c2bdb6871d57bea1c482d0f2589be4812d8882f2b4c39 WHIRLPOOL 931df4da37bb68c3f3693cf2f73a4113867acb18516cfb7fa4e13596b3d3ac8cbc7433086e469ae737ad6c0bd2ec92741bfebd08a11ce900ed1a196761f0dede
+EBUILD xinput-1.6.1.ebuild 557 SHA256 05cc4d4ca25d2430404b954cef1ea7712f6ed159c0e921ab193ae09ff82e6aaf SHA512 461749f418b13774719ce534d62816cf5df76ed081b519c9b4acccccf665a6c6be2593244d201aa819a59f8e750e2607ddd2df3699be40c14aabe7b28002c054 WHIRLPOOL 6409e903f17ca6a39faec85d3d3e9e6d610f76926835f4965d00e2f210fb26b864e28d49648d3c8567b30263fe85bbe529c08e058f06ff9b492921f04c4a2637
+MISC ChangeLog 9624 SHA256 99cef0493c398e498b9f3452c4fa1e1e8185149ac69053ddd1ec0baa9ca6a8dd SHA512 014a4d96783f4a6052d2252d786d1015cc76cb84520a241db20abe4d29ec9a428864780d64fd1469f281a7e2189c03070836b7d1383e56935a39bb6653e718cf WHIRLPOOL cce6465a4f81ee06f290860d71a160920c2b43e8bda88ba226b0e6e588e2ca5d47e7d34095f917e3d19d05034ba8517c7719c7b8159c4f1a34edc843c9aba35f
 MISC metadata.xml 238 SHA256 a01193593f799f27e73ae9388416c70f5f784a69506569189b60aeeaadc64fa1 SHA512 ab2ef7e83b1bd29fbcf6e90a1175a3c3e082c62705aa864d77d3535ab9d3d09c197da8ac52fe00b652983173ffcb86f783f96c92366bdb4d57e70b2c70baf2a9 WHIRLPOOL 10b664a7d6496b2f7e7cfcf3fbc614373553a9850c2dc81737037404ca0aae99b5840aad2fe82d099589269eb93b69d1e61c2adccc4283407e1320afec5a4121
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRromGAAoJELEHsLL7fEFWMeUP/03R47mR6Msc0p7PlMYSqMm2
-jQqxvzMWSr/j+rGzAklQTWtlNMDz9fpEo5MsJWa8n65qf8i0O1CKmJ2AN5hWQ6uU
-k/61hdl9m2DxqXVzz8XBW+HSn/27CMAuUlRu6BJugtdKsjG4RzKkb2RDCpw2OeCj
-FBKlGjOuSgoYjqsQShXrBQPGru3OoiaGsJ04yU0Crodoj/jxn2eYWe3+OluvW9iC
-jz0I7+XRQQ4JZ4WCb+dQfjwlvurX4cvX7C85Pfe0BBiJK65w1+Glf1DCHvAHYrZB
-a9261prywAY5ZbyrF4C0yUxppglKrXHG/5WXf8POaQ4ZaEa0eGQdbu8jA+tYkcsn
-t1F8ynZR4Fq8LqsMBdKQv8VIVhegKN87xOP+WN74GIvXnuCPT608ychHAttiUzQ7
-gNbzOexaEBUCo/I76mrU1si7y0otKzqwvOaFR42iqe4eKQ0dbe2itvKKaYjfJjWS
-qlIgncIJ8+6YNo4NSg15q6wvHwG2y32lRm7PQLNOBoNwk+ojr+bWuUPt6BgGh4vs
-E+NxSzej6I0X2gQlB3EKvE687pLSRWTyS9ph2k4yaSUii+/VKkJDJqTRvnxm6o1M
-pjHNtU1pofSg7U47kLYmd3ZpsXs0p1zaN2lTpPaTU6lKXLL4b8V1Wr3JX0pk6lTC
-NfVSfeyCRXp4AdEXQ4yU
-=p9b3
------END PGP SIGNATURE-----
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"