Version bump for 7.1. This basically includes the changes introduced by the

patch in 1.1.0-r1.
Package-Manager: portage-2.1_rc3

4 files changed, 17 insertions, 276 deletions

diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
index 91edffed1022..cd0b1cfc6824 100644
--- a/x11-drivers/xf86-input-mouse/Manifest
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -1,29 +1,26 @@
-AUX 1.1.0-CVS-20060520.patch 6968 RMD160 41ee97e955b56dc13da4e8488dbfb5c10b1d5903 SHA1 ae26b09bc767bae8cee9b79d09fa754e8a59756d SHA256 e822a1d8e4390b10833173149ef371d59e62e734c4e534832909eeb2376f4a65 size 6968
-MD5 4de58fb79497749a1dd04f4df66d4e6c files/1.1.0-CVS-20060520.patch 6968
-RMD160 41ee97e955b56dc13da4e8488dbfb5c10b1d5903 files/1.1.0-CVS-20060520.patch 6968
-SHA256 e822a1d8e4390b10833173149ef371d59e62e734c4e534832909eeb2376f4a65 files/1.1.0-CVS-20060520.patch 6968
-DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e size 389
-DIST xf86-input-mouse-1.0.4.tar.bz2 250914 RMD160 0afe9d4e33e3b9c488ce6e09555d477013ce3944 SHA256 e425affc2748e5b98a6535534a8bfa4284dfbf0a2715ab4a9a14e70692fe9727 size 250914
-DIST xf86-input-mouse-1.1.0.tar.bz2 273347 RMD160 e1baaba3630d4c8bcd942075804e6f394ec77409 SHA256 6640efc0da1a3444c4f18a567be11aa2a440fb0eee452115ca26eef0cd6d6808 size 273347
-EBUILD xf86-input-mouse-1.0.4.ebuild 586 RMD160 7f24ea949a9e8bc1e12d741ec88ad7ec0b7d9c71 SHA1 3c122ea6ed08915eba0eea4e9b5e9816c0cbf489 SHA256 1569656f1f095f4c933875427b98b14c491bc09ee7082716bfd207d53ab35c5e size 586
+DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
+DIST x11-driver-patches-2.tar.bz2 408 RMD160 00dc7a3127e2b366df081afd37271d84b35333e8 SHA1 6e83b7e8d38aa9e784f15823e7f049268b9dfa41 SHA256 84efaedb3ad098cd13e3499b728dddd5555895d4a469a8d77140c9d8d943cda1
+DIST xf86-input-mouse-1.0.4.tar.bz2 250914 RMD160 0afe9d4e33e3b9c488ce6e09555d477013ce3944 SHA256 e425affc2748e5b98a6535534a8bfa4284dfbf0a2715ab4a9a14e70692fe9727
+DIST xf86-input-mouse-1.1.1.tar.bz2 267066 RMD160 51485ce34e3ab2ef8aeca5960df71b94b4c21bf5 SHA1 afea666192d23ce25f99cd57048a0b4333bfba04 SHA256 133f1b96385d6794e0094ff3ca4f540a3026ea96e264d432f509fb3f98bcb43b
+EBUILD xf86-input-mouse-1.0.4.ebuild 586 RMD160 7f24ea949a9e8bc1e12d741ec88ad7ec0b7d9c71 SHA1 3c122ea6ed08915eba0eea4e9b5e9816c0cbf489 SHA256 1569656f1f095f4c933875427b98b14c491bc09ee7082716bfd207d53ab35c5e
 MD5 33506d5754fe97865464d2076e2c56e0 xf86-input-mouse-1.0.4.ebuild 586
 RMD160 7f24ea949a9e8bc1e12d741ec88ad7ec0b7d9c71 xf86-input-mouse-1.0.4.ebuild 586
 SHA256 1569656f1f095f4c933875427b98b14c491bc09ee7082716bfd207d53ab35c5e xf86-input-mouse-1.0.4.ebuild 586
-EBUILD xf86-input-mouse-1.1.0-r1.ebuild 627 RMD160 584a6e268edac99fb24b5793362c0af63ba1fdd4 SHA1 a7e201a466d59ae40174ecd907f39527bb6f54cd SHA256 6d927987bc3ef2de72d05603699735e2aeb0eea995bdaaf20f54a2434ef24e11 size 627
-MD5 af279c660e51ee858e12924d980942fd xf86-input-mouse-1.1.0-r1.ebuild 627
-RMD160 584a6e268edac99fb24b5793362c0af63ba1fdd4 xf86-input-mouse-1.1.0-r1.ebuild 627
-SHA256 6d927987bc3ef2de72d05603699735e2aeb0eea995bdaaf20f54a2434ef24e11 xf86-input-mouse-1.1.0-r1.ebuild 627
-MISC ChangeLog 3479 RMD160 61e7fb80a4aa812c67606e8002269aabb8e82c9b SHA1 b4f199181f24c6caf0a6c3582e0c61ee1d9c905c SHA256 02f90d31031ceed3ed09d6fc5caae076f913283275cb0c1ed5309c1154572509 size 3479
-MD5 c7da25038e4fb96420600e1401d4325b ChangeLog 3479
-RMD160 61e7fb80a4aa812c67606e8002269aabb8e82c9b ChangeLog 3479
-SHA256 02f90d31031ceed3ed09d6fc5caae076f913283275cb0c1ed5309c1154572509 ChangeLog 3479
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
+EBUILD xf86-input-mouse-1.1.1.ebuild 591 RMD160 a8094b939bbedfcf519fef80266808a3c7d2dd4a SHA1 09c33cf2ab9e6b963522b9be616438987bd1cea6 SHA256 f7e30cda3a33d871e5342779b45eeb89e5b20c2456d7bab08ee8b1062a19e452
+MD5 8480826ae45524bf2753816c53ba1629 xf86-input-mouse-1.1.1.ebuild 591
+RMD160 a8094b939bbedfcf519fef80266808a3c7d2dd4a xf86-input-mouse-1.1.1.ebuild 591
+SHA256 f7e30cda3a33d871e5342779b45eeb89e5b20c2456d7bab08ee8b1062a19e452 xf86-input-mouse-1.1.1.ebuild 591
+MISC ChangeLog 3784 RMD160 9aa4f0d7705ee7c9801be2cc01c287eed988dd8c SHA1 6b6717a167d6ede17a7cfda3c2977fb5f6e6defc SHA256 4c4f7ebd626d7b084030248c592571ba87fb7c03c2d0ded3f0d968399dffe56f
+MD5 57df24e070fedbe86f2c8686b77c8109 ChangeLog 3784
+RMD160 9aa4f0d7705ee7c9801be2cc01c287eed988dd8c ChangeLog 3784
+SHA256 4c4f7ebd626d7b084030248c592571ba87fb7c03c2d0ded3f0d968399dffe56f ChangeLog 3784
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
 MD5 5f3f604de6ae79fbe548ce3864657873 files/digest-xf86-input-mouse-1.0.4 527
 RMD160 ccb41a2f54710bb174f8b91b3762fa8eedaaf97c files/digest-xf86-input-mouse-1.0.4 527
 SHA256 b6c30a76d7873a8300a519fc2e5d8d07129d94ef75171a7086e52e9884edb1f0 files/digest-xf86-input-mouse-1.0.4 527
-MD5 f817ce686765f56485148baf5d0af29d files/digest-xf86-input-mouse-1.1.0-r1 527
-RMD160 c1f065ff9b68473dc854274bf9c920e45a2b09f7 files/digest-xf86-input-mouse-1.1.0-r1 527
-SHA256 40d62d84f84bce5a741b67d22559b23d0cd56cf54301299dff91a786a2e369d0 files/digest-xf86-input-mouse-1.1.0-r1 527
+MD5 c2a0d6f28512845a9ee514f725bcad56 files/digest-xf86-input-mouse-1.1.1 527
+RMD160 334ed41ad4f5e92fd733f185612559dd24e78330 files/digest-xf86-input-mouse-1.1.1 527
+SHA256 064bc214dd3b7d497351168b47c9344d6c0e3643f455b199a107fd2fdb622caa files/digest-xf86-input-mouse-1.1.1 527
diff --git a/x11-drivers/xf86-input-mouse/files/1.1.0-CVS-20060520.patch b/x11-drivers/xf86-input-mouse/files/1.1.0-CVS-20060520.patch
deleted file mode 100644
index 02ea422b6813..000000000000
--- a/x11-drivers/xf86-input-mouse/files/1.1.0-CVS-20060520.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-? 1.1.0-CVS-20060520.patch
-Index: ChangeLog
-===================================================================
-RCS file: /cvs/xorg/driver/xf86-input-mouse/ChangeLog,v
-retrieving revision 1.16
-retrieving revision 1.18
-diff -u -B -r1.16 -r1.18
---- ChangeLog	7 Apr 2006 17:59:54 -0000	1.16
-+++ ChangeLog	21 Apr 2006 11:15:23 -0000	1.18
-@@ -1,3 +1,18 @@
-+2006-04-21  Matthias Hopf  <mhopf@suse.de>
-+
-+	* man/mouse.man:
-+	Fixed default for YAxisMapping.
-+	Changed default for ZAxisMapping. Added short explanation.
-+	* src/mouse.c: (MouseCommonOptions), (MouseReadInput):
-+	Autodetect (one way only) single wheel only for EXPS2.
-+	Use singlebit protocol for multiwheel EXPS2 mice.
-+
-+2006-04-20  Matthias Hopf  <mhopf@suse.de>
-+
-+	* src/mouse.c: (MousePostEvent):
-+	Overhaul of wheel processing. Does work correctly with multibit
-+	zaxis events now.
-+
- 2006-04-06  Adam Jackson  <ajax@freedesktop.org>
- 
- 	* configure.ac:
-Index: man/mouse.man
-===================================================================
-RCS file: /cvs/xorg/driver/xf86-input-mouse/man/mouse.man,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -B -r1.11 -r1.12
---- man/mouse.man	2 Feb 2006 11:53:50 -0000	1.11
-+++ man/mouse.man	21 Apr 2006 11:15:23 -0000	1.12
-@@ -138,7 +138,7 @@
- .I N1
- is mapped to the negative Y axis motion and button number
- .I N2
--is mapped to the positive Y axis motion.  Default: "4 5".
-+is mapped to the positive Y axis motion.  Default: no mapping.
- .TP 7
- .BI "Option \*qZAxisMapping\*q \*qX\*q"
- .TP 7
-@@ -161,7 +161,9 @@
- .I N3
- and
- .IR N4 .
--Default: "4 5 6 7".
-+Note that the protocols for mice with one and two wheels can be different
-+and the driver may not be able to autodetect it.
-+Default: "4 5".
- .TP 7
- .BI "Option \*qButtonMapping\*q \*q" "N1 N2 [...]" \*q
- Specifies how physical mouse buttons are mapped to logical buttons.
-Index: src/mouse.c
-===================================================================
-RCS file: /cvs/xorg/driver/xf86-input-mouse/src/mouse.c,v
-retrieving revision 1.27
-retrieving revision 1.29
-diff -u -B -r1.27 -r1.29
---- src/mouse.c	7 Apr 2006 17:59:54 -0000	1.27
-+++ src/mouse.c	21 Apr 2006 11:15:23 -0000	1.29
-@@ -543,18 +543,18 @@
- 	xfree(s);
-     }
- 
--    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5 6 7");
-+    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
-     if (s) {
- 	int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
- 	char *msg = NULL;
- 
-+	pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
-+	pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
- 	if (!xf86NameCmp(s, "x")) {
- 	    pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
--	    pMse->negativeW = pMse->positiveW = MSE_MAPTOX;
- 	    msg = xstrdup("X axis");
- 	} else if (!xf86NameCmp(s, "y")) {
- 	    pMse->negativeZ = pMse->positiveZ = MSE_MAPTOY;
--	    pMse->negativeW = pMse->positiveW = MSE_MAPTOY;
- 	    msg = xstrdup("Y axis");
- 	} else if (sscanf(s, "%d %d %d %d", &b1, &b2, &b3, &b4) >= 2 &&
- 		 b1 > 0 && b1 <= MSE_MAXBUTTONS &&
-@@ -562,8 +562,8 @@
- 	    msg = xstrdup("buttons XX and YY");
- 	    if (msg)
- 		sprintf(msg, "buttons %d and %d", b1, b2);
--	    pMse->negativeZ = pMse->negativeW = 1 << (b1-1);
--	    pMse->positiveZ = pMse->positiveW = 1 << (b2-1);
-+	    pMse->negativeZ = 1 << (b1-1);
-+	    pMse->positiveZ = 1 << (b2-1);
- 	    if (b3 > 0 && b3 <= MSE_MAXBUTTONS &&
- 		b4 > 0 && b4 <= MSE_MAXBUTTONS) {
- 		if (msg)
-@@ -578,9 +578,6 @@
- 	    if (b2 > pMse->buttons) pMse->buttons = b2;
- 	    if (b3 > pMse->buttons) pMse->buttons = b3;
- 	    if (b4 > pMse->buttons) pMse->buttons = b4;
--	} else {
--	    pMse->negativeZ = pMse->positiveZ = MSE_NOZMAP;
--	    pMse->negativeW = pMse->positiveW = MSE_NOZMAP;
- 	}
- 	if (msg) {
- 	    xf86Msg(X_CONFIG, "%s: ZAxisMapping: %s\n", pInfo->name, msg);
-@@ -1506,7 +1503,21 @@
- 		      (pBuf[3] & 0x20) >> 1;        /* button 5 */
- 	    dx = (pBuf[0] & 0x10) ?    pBuf[1]-256  :  pBuf[1];
- 	    dy = (pBuf[0] & 0x20) ?  -(pBuf[2]-256) : -pBuf[2];
--	    dz = (pBuf[3] & 0x08) ? (pBuf[3] & 0x0f) - 16 : (pBuf[3] & 0x0f);
-+	    if (pMse->negativeW != MSE_NOAXISMAP) {
-+		switch (pBuf[3] & 0x0f) {
-+		case 0x00:          break;
-+		case 0x01: dz =  1; break;
-+		case 0x02: dw =  1; break;
-+		case 0x0e: dw = -1; break;
-+		case 0x0f: dz = -1; break;
-+		default:
-+		    xf86Msg(X_INFO,
-+			    "Mouse autoprobe: Disabling secondary wheel\n");
-+		    pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
-+		}
-+	    }
-+	    if (pMse->negativeW == MSE_NOAXISMAP)
-+	        dz = (pBuf[3]&0x08) ? (pBuf[3]&0x0f) - 16 : (pBuf[3]&0x0f);
- 	    break;
- 
- 	case PROT_MMPS2:	/* MouseMan+ PS/2 */
-@@ -2332,7 +2343,7 @@
- 	       int dx, int dy, int dz, int dw)
- {
-     MouseDevPtr pMse;
--    int zbutton = 0;
-+    int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
-     int i, b, buttons = 0;
- 
-     pMse = pInfo->private;
-@@ -2353,6 +2364,7 @@
-     /* XXX Could this go in the conversion_proc? */
-     switch (pMse->negativeZ) {
-     case MSE_NOZMAP:	/* do nothing */
-+	dz = 0;
- 	break;
-     case MSE_MAPTOX:
- 	if (dz != 0) {
-@@ -2367,20 +2379,46 @@
- 	}
- 	break;
-     default:	/* buttons */
--	buttons &= ~(pMse->negativeZ | pMse->positiveZ
--		   | pMse->negativeW | pMse->positiveW);
--	if (dw < 0 || dz < -1)
--	    zbutton = pMse->negativeW;
--	else if (dz < 0)
-+	buttons &= ~(pMse->negativeZ | pMse->positiveZ);
-+	if (dz < 0) {
- 	    zbutton = pMse->negativeZ;
--	else if (dw > 0 || dz > 1)
--	    zbutton = pMse->positiveW;
--	else if (dz > 0)
-+	    zbuttoncount = -dz;
-+	} else if (dz > 0) {
- 	    zbutton = pMse->positiveZ;
--	buttons |= zbutton;
-+	    zbuttoncount = dz;
-+	}
- 	dz = 0;
- 	break;
-     }
-+    switch (pMse->negativeW) {
-+    case MSE_NOZMAP:	/* do nothing */
-+	dw = 0;
-+	break;
-+    case MSE_MAPTOX:
-+	if (dw != 0) {
-+	    dx = dw;
-+	    dw = 0;
-+	}
-+	break;
-+    case MSE_MAPTOY:
-+	if (dw != 0) {
-+	    dy = dw;
-+	    dw = 0;
-+	}
-+	break;
-+    default:	/* buttons */
-+	buttons &= ~(pMse->negativeW | pMse->positiveW);
-+	if (dw < 0) {
-+	    wbutton = pMse->negativeW;
-+	    wbuttoncount = -dw;
-+	} else if (dw > 0) {
-+	    wbutton = pMse->positiveW;
-+	    wbuttoncount = dw;
-+	}
-+	dw = 0;
-+	break;
-+    }
-+
- 
-     /* Apply angle offset */
-     if (pMse->angleOffset != 0) {
-@@ -2397,16 +2435,19 @@
- 	dx = dy;
- 	dy = tmp;
-     }
--    MouseDoPostEvent(pInfo, buttons, dx, dy);
- 
--    /*
--     * If dz has been mapped to a button `down' event, we need to cook up
--     * a corresponding button `up' event.
--     */
--    if (zbutton) {
--	buttons &= ~zbutton;
--	MouseDoPostEvent(pInfo, buttons, 0, 0);
--    }
-+    /* If mouse wheel movement has to be mapped on a button, we need to
-+     * loop for button press and release events. */
-+    do {
-+        MouseDoPostEvent(pInfo, buttons | zbutton | wbutton, dx, dy);
-+	dx = dy = 0;
-+	if (zbutton || wbutton)
-+	    MouseDoPostEvent(pInfo, buttons, 0, 0);
-+	if (--zbuttoncount <= 0)
-+	    zbutton = 0;
-+	if (--wbuttoncount <= 0)
-+	    wbutton = 0;
-+    } while (zbutton || wbutton);
- 
-     pMse->lastButtons = truebuttons;
- }
diff --git a/x11-drivers/xf86-input-mouse/files/digest-xf86-input-mouse-1.1.0-r1 b/x11-drivers/xf86-input-mouse/files/digest-xf86-input-mouse-1.1.0-r1
deleted file mode 100644
index a4af12f36814..000000000000
--- a/x11-drivers/xf86-input-mouse/files/digest-xf86-input-mouse-1.1.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 7004e6901eeb624759dfe271e88ecb0a xf86-input-mouse-1.1.0.tar.bz2 273347
-RMD160 e1baaba3630d4c8bcd942075804e6f394ec77409 xf86-input-mouse-1.1.0.tar.bz2 273347
-SHA256 6640efc0da1a3444c4f18a567be11aa2a440fb0eee452115ca26eef0cd6d6808 xf86-input-mouse-1.1.0.tar.bz2 273347
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.1.0-r1.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.1.0-r1.ebuild
deleted file mode 100644
index 59c7ca80294c..000000000000
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.1.0-r1.ebuild,v 1.1 2006/05/20 08:38:15 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for mouse input devices"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/randrproto
-	x11-proto/xproto"
-
-PATCHES="${FILESDIR}/${PV}-CVS-20060520.patch"