Fix bug #478658.

Two of brltty's udev rules were conflicting with
rules for USB-to-serial converters. These are now commented out, per
the suggestion on the brltty mailing list.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

3 files changed, 38 insertions, 3 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 6b5bfeac2e49..f418ca2cad92 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.131 2013/08/20 06:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.132 2013/08/20 13:47:27 teiresias Exp $
+
+*brltty-4.5-r1 (20 Aug 2013)
+
+  20 Aug 2013; Christopher Brannon <teiresias@gentoo.org> -brltty-4.5.ebuild,
+  +brltty-4.5-r1.ebuild, +files/brltty-4.5-udev.patch:
+  Fix bug #478658. Two of brltty's udev rules were conflicting with
+  rules for USB-to-serial converters. These are now commented out, per
+  the suggestion on the brltty mailing list.
 
   20 Aug 2013; Mike Frysinger <vapier@gentoo.org> files/brltty.rc:
   Fix excessive indent.
diff --git a/app-accessibility/brltty/brltty-4.5.ebuild b/app-accessibility/brltty/brltty-4.5-r1.ebuild
index 4c8897e53fa0..8656ca1e9e9a 100644
--- a/app-accessibility/brltty/brltty-4.5.ebuild
+++ b/app-accessibility/brltty/brltty-4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5.ebuild,v 1.3 2013/08/07 14:35:11 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r1.ebuild,v 1.1 2013/08/20 13:47:27 teiresias Exp $
 
 EAPI=5
 
@@ -42,7 +42,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 	${COMMON_DEP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.5-fix-ldflags.patch
+	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
+		"${FILESDIR}"/${P}-udev.patch
 
 	java-pkg-opt-2_src_prepare
 
diff --git a/app-accessibility/brltty/files/brltty-4.5-udev.patch b/app-accessibility/brltty/files/brltty-4.5-udev.patch
new file mode 100644
index 000000000000..edd2792c4b61
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.5-udev.patch
@@ -0,0 +1,26 @@
+diff -Naur brltty-4.5/Hotplug/udev.rules brltty-4.5.new/Hotplug/udev.rules
+--- brltty-4.5/Hotplug/udev.rules	2013-03-27 15:51:37.000000000 -0700
++++ brltty-4.5.new/Hotplug/udev.rules	2013-08-19 06:32:11.557621082 -0700
+@@ -172,19 +172,20 @@
+ # FreedomScientific [Focus Blue]
+ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_DRIVER}="fs", GOTO="brltty_usb_run"
+ 
++# Seika rules are commented out.  They conflict with USB-to-serial converters.
+ # Device: 10C4:EA60
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge / myAVR mySmartUSB light
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
++# ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 10C4:EA80
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge
+ # Seika [Note Taker]
+-ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
++# ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 1C71:C005
+ # HumanWare [all models]