Fix evdev compatibility with non-input-hotplug servers. (Bug #154075, Marien

Zwart)
(Portage version: 2.1.2_rc1-r3)

4 files changed, 50 insertions, 1 deletions

diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog
index 4e7de00d7465..64e9399fd1a2 100644
--- a/x11-drivers/xf86-input-evdev/ChangeLog
+++ b/x11-drivers/xf86-input-evdev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-input-evdev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.45 2006/11/02 23:35:43 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.46 2006/11/05 16:34:28 joshuabaergen Exp $
+
+*xf86-input-evdev-1.1.4-r1 (05 Nov 2006)
+
+  05 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.1.4-fix_compatibility.patch, -xf86-input-evdev-1.1.4.ebuild,
+  +xf86-input-evdev-1.1.4-r1.ebuild:
+  Fix evdev compatibility with non-input-hotplug servers.  (Bug #154075, Marien
+  Zwart)
 
   02 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xf86-input-evdev-1.1.4.ebuild:
diff --git a/x11-drivers/xf86-input-evdev/files/1.1.4-fix_compatibility.patch b/x11-drivers/xf86-input-evdev/files/1.1.4-fix_compatibility.patch
new file mode 100644
index 000000000000..8a7c76da5b34
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/1.1.4-fix_compatibility.patch
@@ -0,0 +1,14 @@
+--- src/evdev_key.c.old	2006-11-04 17:01:57.000000000 -0700
++++ src/evdev_key.c	2006-11-04 17:05:28.000000000 -0700
+@@ -240,9 +240,11 @@
+ static void
+ EvdevKbdBell (int percent, DeviceIntPtr device, pointer arg, int unused)
+ {
++#ifdef xf86OSRingBell
+     KeybdCtrl *ctrl = arg;
+ 
+     xf86OSRingBell(percent, ctrl->bell_pitch, ctrl->bell_duration);
++#endif
+ }
+ 
+ static void
diff --git a/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.4-r1 b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.4-r1
new file mode 100644
index 000000000000..dfebbad1f375
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/digest-xf86-input-evdev-1.1.4-r1
@@ -0,0 +1,6 @@
+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 181ae488027aa9b911ca20fd96d5ac42 xf86-input-evdev-1.1.4.tar.bz2 237867
+RMD160 abe525d033615b785bed1923dac2816c22febbc7 xf86-input-evdev-1.1.4.tar.bz2 237867
+SHA256 e0bd779c74500c1eae618a73ac08b2672d5c88196d16192c71318a528adbb89f xf86-input-evdev-1.1.4.tar.bz2 237867
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.4-r1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..35273de56903
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.1.4-r1.ebuild
@@ -0,0 +1,21 @@
+# 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-evdev/xf86-input-evdev-1.1.4-r1.ebuild,v 1.1 2006/11/05 16:34:28 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Generic Linux input driver"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	>=x11-proto/inputproto-1.4
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/${PV}-fix_compatibility.patch"