From 811a29b0cd9c21917bf244175069fb791ec4b0ca Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 20 Aug 2013 13:47:27 +0000 Subject: 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) --- app-accessibility/brltty/ChangeLog | 10 +- app-accessibility/brltty/brltty-4.5-r1.ebuild | 146 +++++++++++++++++++++ app-accessibility/brltty/brltty-4.5.ebuild | 145 -------------------- .../brltty/files/brltty-4.5-udev.patch | 26 ++++ 4 files changed, 181 insertions(+), 146 deletions(-) create mode 100644 app-accessibility/brltty/brltty-4.5-r1.ebuild delete mode 100644 app-accessibility/brltty/brltty-4.5.ebuild create mode 100644 app-accessibility/brltty/files/brltty-4.5-udev.patch 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 -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 files/brltty.rc: Fix excessive indent. diff --git a/app-accessibility/brltty/brltty-4.5-r1.ebuild b/app-accessibility/brltty/brltty-4.5-r1.ebuild new file mode 100644 index 000000000000..8656ca1e9e9a --- /dev/null +++ b/app-accessibility/brltty/brltty-4.5-r1.ebuild @@ -0,0 +1,146 @@ +# 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-r1.ebuild,v 1.1 2013/08/20 13:47:27 teiresias Exp $ + +EAPI=5 + +FINDLIB_USE="ocaml" + +inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \ + autotools udev + +DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" +HOMEPAGE="http://mielke.cc/brltty/" +SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu + java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech + tcl X" +REQUIRED_USE="doc? ( api ) + java? ( api ) + ocaml? ( api ) + python? ( api ) + tcl? ( api )" + +COMMON_DEP="bluetooth? ( net-wireless/bluez ) + gpm? ( >=sys-libs/gpm-1.20 ) + iconv? ( virtual/libiconv ) + icu? ( dev-libs/icu ) + ncurses? ( sys-libs/ncurses ) + nls? ( virtual/libintl ) + python? ( >=dev-python/cython-0.16 ) + tcl? ( >=dev-lang/tcl-8.4.15 ) + usb? ( virtual/libusb:0 ) + X? ( x11-libs/libXaw )" +DEPEND="virtual/pkgconfig + java? ( >=virtual/jdk-1.4 ) + ${COMMON_DEP}" +RDEPEND="java? ( >=virtual/jre-1.4 ) + ${COMMON_DEP}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-ldflags.patch \ + "${FILESDIR}"/${P}-udev.patch + + java-pkg-opt-2_src_prepare + + # We run eautoconf instead of using eautoreconf because brltty uses + # a custom build system that uses autoconf without the rest of the + # autotools. + eautoconf +} + +src_configure() { + # override prefix in order to install into / + # braille terminal needs to be available as soon in the boot process as + # possible + # Also override localstatedir so that the lib/brltty directory is installed + # correctly. + # Disable stripping since we do that ourselves. + econf \ + --prefix=/ \ + --includedir=/usr/include \ + --localstatedir=/var \ + --disable-stripping \ + --with-install-root="${D}" \ + $(use_enable api) \ + $(use_enable beeper beeper-support) \ + $(use_enable contracted-braille) \ + $(use_enable fm fm-support) \ + $(use_enable gpm) \ + $(use_enable iconv) \ + $(use_enable icu) \ + $(use_enable java java-bindings) \ + $(use_enable learn-mode) \ + $(use_enable midi midi-support) \ + $(use_enable nls i18n) \ + $(use_enable ocaml ocaml-bindings) \ + $(use_enable pcm pcm-support) \ + $(use_enable python python-bindings) \ + $(use_enable speech speech-support) \ + $(use_enable tcl tcl-bindings) \ + $(use_enable X x) \ + $(use_with bluetooth bluetooth-package) \ + $(use_with ncurses curses) \ + $(use_with usb usb-package) +} + +src_compile() { + local JAVAC_CONF="" + local OUR_JNI_FLAGS="" + if use java; then + OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)" + JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)" + fi + + # workaround for parallel build failure, bug #340903. + emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" +} + +src_install() { + if use ocaml; then + findlib_src_preinst + fi + + emake OCAML_LDCONF= install + + if use java; then + # make install puts the _java.so there, and no it's not $(get_libdir) + rm -rf "${D}/usr/lib/java" + java-pkg_doso Bindings/Java/libbrlapi_java.so + java-pkg_dojar Bindings/Java/brlapi.jar + fi + + insinto /etc + doins Documents/brltty.conf + udev_newrules Hotplug/udev.rules 70-brltty.rules + newinitd "${FILESDIR}"/brltty.rc brltty + + libdir="$(get_libdir)" + mkdir -p "${D}"/usr/${libdir}/ + mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ + gen_usr_ldscript libbrlapi.so + + cd Documents + mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt + mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt + mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt + dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt + dohtml -r Manual-BRLTTY + if use doc; then + dohtml -r Manual-BrlAPI + dodoc BrlAPI-*.txt + fi +} + +pkg_postinst() { + elog + elog please be sure "${ROOT}"etc/brltty.conf is correct for your system. + elog + elog To make brltty start on boot, type this command as root: + elog + elog rc-update add brltty boot +} diff --git a/app-accessibility/brltty/brltty-4.5.ebuild b/app-accessibility/brltty/brltty-4.5.ebuild deleted file mode 100644 index 4c8897e53fa0..000000000000 --- a/app-accessibility/brltty/brltty-4.5.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# 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 $ - -EAPI=5 - -FINDLIB_USE="ocaml" - -inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \ - autotools udev - -DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" -HOMEPAGE="http://mielke.cc/brltty/" -SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu - java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech - tcl X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ) - tcl? ( api )" - -COMMON_DEP="bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - python? ( >=dev-python/cython-0.16 ) - tcl? ( >=dev-lang/tcl-8.4.15 ) - usb? ( virtual/libusb:0 ) - X? ( x11-libs/libXaw )" -DEPEND="virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) - ${COMMON_DEP}" -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.5-fix-ldflags.patch - - java-pkg-opt-2_src_prepare - - # We run eautoconf instead of using eautoreconf because brltty uses - # a custom build system that uses autoconf without the rest of the - # autotools. - eautoconf -} - -src_configure() { - # override prefix in order to install into / - # braille terminal needs to be available as soon in the boot process as - # possible - # Also override localstatedir so that the lib/brltty directory is installed - # correctly. - # Disable stripping since we do that ourselves. - econf \ - --prefix=/ \ - --includedir=/usr/include \ - --localstatedir=/var \ - --disable-stripping \ - --with-install-root="${D}" \ - $(use_enable api) \ - $(use_enable beeper beeper-support) \ - $(use_enable contracted-braille) \ - $(use_enable fm fm-support) \ - $(use_enable gpm) \ - $(use_enable iconv) \ - $(use_enable icu) \ - $(use_enable java java-bindings) \ - $(use_enable learn-mode) \ - $(use_enable midi midi-support) \ - $(use_enable nls i18n) \ - $(use_enable ocaml ocaml-bindings) \ - $(use_enable pcm pcm-support) \ - $(use_enable python python-bindings) \ - $(use_enable speech speech-support) \ - $(use_enable tcl tcl-bindings) \ - $(use_enable X x) \ - $(use_with bluetooth bluetooth-package) \ - $(use_with ncurses curses) \ - $(use_with usb usb-package) -} - -src_compile() { - local JAVAC_CONF="" - local OUR_JNI_FLAGS="" - if use java; then - OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)" - JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)" - fi - - # workaround for parallel build failure, bug #340903. - emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" -} - -src_install() { - if use ocaml; then - findlib_src_preinst - fi - - emake OCAML_LDCONF= install - - if use java; then - # make install puts the _java.so there, and no it's not $(get_libdir) - rm -rf "${D}/usr/lib/java" - java-pkg_doso Bindings/Java/libbrlapi_java.so - java-pkg_dojar Bindings/Java/brlapi.jar - fi - - insinto /etc - doins Documents/brltty.conf - udev_newrules Hotplug/udev.rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - - libdir="$(get_libdir)" - mkdir -p "${D}"/usr/${libdir}/ - mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ - gen_usr_ldscript libbrlapi.so - - cd Documents - mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt - mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt - mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt - dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt - dohtml -r Manual-BRLTTY - if use doc; then - dohtml -r Manual-BrlAPI - dodoc BrlAPI-*.txt - fi -} - -pkg_postinst() { - elog - elog please be sure "${ROOT}"etc/brltty.conf is correct for your system. - elog - elog To make brltty start on boot, type this command as root: - elog - elog rc-update add brltty boot -} 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] -- cgit v1.2.3-65-gdbad