New upstream version.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

6 files changed, 265 insertions, 15 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 1e5865a26ffb..09b41fc0d85f 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.144 2014/01/19 10:17:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.145 2014/02/09 18:55:59 teiresias Exp $
+
+*brltty-5.0 (09 Feb 2014)
+
+  09 Feb 2014; Christopher Brannon <teiresias@gentoo.org> +brltty-5.0.ebuild,
+  +files/brltty-5.0-fix-ldflags.patch, +files/brltty-5.0-respect-AR.patch,
+  +files/brltty-5.0-udev.patch:
+  New upstream version.
 
   19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> brltty-4.5-r3.ebuild:
   Stable for ppc64, wrt bug #495312
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index cfbb81832629..03d308c29b70 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -11,28 +11,27 @@ AUX brltty-4.5-fix-mk4build-cross.patch 759 SHA256 1abb970aa9e6797d6a859e0b861c5
 AUX brltty-4.5-range-checking-and-array-bounds.patch 5168 SHA256 2838d9fa69343f540047fff61e183249d7713c105aadaee9693375024bfed5c2 SHA512 20ae848311b3688d8b6dc68cb681661070b33170e3dee2f814a1396c07bd78ccadb67f1daaa77624ef64635036800adc9e79220ac968b867ca8a39f4c1881b96 WHIRLPOOL e52751b98b22599bdd8663e8f4c5f5009494cfc2022dd4d4c14a3f50fcb05ea93f327c0318fcefa76b4515adf06887f1c214f97e3b7241c040ecf28619ca3054
 AUX brltty-4.5-respect-AR.patch 403 SHA256 01786fd2e922f4595a59753a9e5fc7c0c8bfb24310337726ce82947c65cd2046 SHA512 1d531a7cd28b84dba92144cd4405b955ef0bf3cebef6a12bbcebee8f32f38c32c49c27143591176ea913aecf2398e75bb71c600fe51283fc51cfe1339d3b88d9 WHIRLPOOL 16da2ce9cbdeca7623f7e3146b71c0bb8959ced3c26abf71e2f845b93aacafc8b4d73e91d749b7aa8c6e42f36b383d7d671f50b7dfe07256adcf7c822407600d
 AUX brltty-4.5-udev.patch 1105 SHA256 0472a6f103c95d4f2c3214f246092f39ded516ebcf682bd1ed86ee67911fd2cf SHA512 69a15bd7aff192f949e6a01e9f869d24a8b75e91938156fd2ff8fd510755c2a83ca9f35381f3bd2c8877fd2a5101a861b718cc103c960dce58ae4174209b1847 WHIRLPOOL 052715b04b688988ca6c86b2330a318b93d59bde3a10faa51f2faf9bbba011967d7e166883d6060d9ada8d7b4002b1270434cb1d2614ff9b1d395022da1e39af
+AUX brltty-5.0-fix-ldflags.patch 2168 SHA256 6d9022614cb0d1d65ad11f0f924c369a860a7f2e02bfec77f8a61c60350daa75 SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 WHIRLPOOL 9214b7f5810aee65e5bbaf16830eb9c5f63e4c25d26a2f484fc7b700412db32ddc3adf34026f9dc7c98fe111c28d11431e28346d6d6bab8c7a017702a0649df2
+AUX brltty-5.0-respect-AR.patch 403 SHA256 01786fd2e922f4595a59753a9e5fc7c0c8bfb24310337726ce82947c65cd2046 SHA512 1d531a7cd28b84dba92144cd4405b955ef0bf3cebef6a12bbcebee8f32f38c32c49c27143591176ea913aecf2398e75bb71c600fe51283fc51cfe1339d3b88d9 WHIRLPOOL 16da2ce9cbdeca7623f7e3146b71c0bb8959ced3c26abf71e2f845b93aacafc8b4d73e91d749b7aa8c6e42f36b383d7d671f50b7dfe07256adcf7c822407600d
+AUX brltty-5.0-udev.patch 1215 SHA256 4f2deb06ad102126c3ad624aab09baf052fa2627c49340924688c9b5965f0721 SHA512 436ee879c1948eb6418fcb4d69431dae9640e4b1905971657143646de438541ed0bacca1d7b5b154e235b6e73915fbab843edd8c5dc8881965958fc4aac637e8 WHIRLPOOL 6f11252da78130050b4335e8aa8c8b9a597a4728684f50759d97003a98e3592e9f14cb9d28e087a7353ce5e585ef2b7846a826acf660042c5a73155f98d6181b
 AUX brltty.rc 356 SHA256 24950c773d16156fed8f71be72abefa77a4c45d930e2ea53b6371a0e659644f8 SHA512 4e4b363aa297f94c2078744417e630d13d5796ed55f24929e39f43108cce91c7dd49622d24d28fd91d3642371370feb9a62256d773ec052617bd4f015be81af2 WHIRLPOOL 26e7c5344218c79e4cbddbb0fd82a6589116fe43afe4439881c7f3d4dcafcf60f447cab8e5574d5f3aab83bbc85522f3b25f28497c1ad8a136b4b32abe9673d6
 DIST brltty-4.2.tar.gz 2234191 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2 SHA512 94b7fe40593d06a242be57c8cee1f06c0869515bc0be97eccc1d81dd57549bf2197e7ebdf1f9cb173dd4b6048df9a85adb327b5cd1cc74888b06145755a27cb5 WHIRLPOOL 0109b1e7d57f4246af84a5cd3fe48a6190a374787e059c058de758d4e38368a61015b25912efa71065ece5dd2e0bf5900af4d72ae111bab235c0e8807c039b73
 DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
+DIST brltty-5.0.tar.xz 2213768 SHA256 e3613fa2e8c3450d7e7bee7107235344c474dc310af5adcc19761f361e8c8b92 SHA512 2a66f2fcf0ada9a499450e14c11efe2cffd1e9b465755aab60093f383c596d4f4f3be0651e6559df143fc1547a5d5be24caf485596cb8ad691b029de110f8dcc WHIRLPOOL 3f36f036f5eb6479e9c42cc79eead215d7133cfb6d2c4de3e4eaa6f776299d021c7830e32c914b7cb7686bd4d31902c0762d309702ef686ab7b37aff6ee4161a
 EBUILD brltty-4.2-r1.ebuild 4163 SHA256 46e613ed1ac40e8805302d9cb9fde8910d8a6f4adfcc36070ec0e3af99649d72 SHA512 371fb3cbfeec164e519048e96ba9270fda8dde3317d136f292be1a91c35c557e5567b2634b2c76f5cef235f69bf6c33725bdc6f5e80543ba9380caf0218dd340 WHIRLPOOL 241aedf9ff83b2cf8eef11436626f5a591162fb96f8283e32977abff740693f5518b0d632d0d1835e92491a4bc254b81ef0d2cf693f3af81fd46416a33ed8b3e
 EBUILD brltty-4.2.ebuild 4133 SHA256 b0e521c09b7b5b5621a6fbd537ae22d8a22cf7b68d558c0ae2203a20d7365884 SHA512 8ecf0911f15710bbd760ec4b3e55503914efad8ef29a4594dd3bad982d209e1e07aa401a603a9458009c3e70b667757757e2ba3d6aa58e9f50d073bf3ecafb5e WHIRLPOOL 839206b4c32db6d5639cce90b07e4f2699a4b0e99718dd03d37efe20e6c6d0cbf2c56a86902eecf54ae47c0af6b3cfffdcd08512465eeb69545337116d6d6b30
 EBUILD brltty-4.5-r3.ebuild 4182 SHA256 f9ee3fa821ba2f5d390f020c610c20dc8f223184cbc4f5e8f2985e3ba5b48cc6 SHA512 9bf46d9c7ac2342f5b7ed3bc7fc8eeb1c91fbd50e844ed0edc2b89a4004f2626837f058ac2d07072696f89578dc91ad5dedf1025f055d0b130453aacf0a63f56 WHIRLPOOL 48e1b4d97f50e5e50f7847cb6ec41f6c2e06ac16d5b661ce6b2c5f22f5438c272da25e08f1d4604e0c6ba342e6c21d1fad0f6c35ec92e8ec6c4b2adf6dcb85f5
-MISC ChangeLog 18460 SHA256 807f2a30f4c970f7282760c3e394a5547891c7763ca71debb62fce8c5a5caa1b SHA512 4ce637502ea441434e088f6da275b7db1e9396943af6e1eb76e741cf9d69ff399fc83b363afb808d0ec5a41093ca1678376bbedc706015bb251a20a4accfe8a8 WHIRLPOOL c91b2c1d42b947ad07f8449b501cd7718855c1cafa1f3ead896172c04f96ceb88cc9b3c7bd4aa3b45e1f7c86dc3ee6f057a4f7944c495dc87e9e2fb56edf2dfc
+EBUILD brltty-5.0.ebuild 4146 SHA256 decf9d0eaf0332cfd9390f9986d9fc315551bc58461356411f35663c6c1fa1e4 SHA512 f47de263a55ba0b5cecd6a1c1a2d59d6e802b5f57ddbdc08d711e1df4b2a7a429507d1c8b1c15354436cd0c867d214ac0f7ac95a7b2ee8109a6eee7158150d7f WHIRLPOOL cb9311d81a77425c09eb4ca49c40505ae79dfcf9b8fd44182cd5a24bc901fc6d6e27f0704d3cc1b989c8fa9d85ad9304caa4b293ad99ed9083475c44a9c7d4c8
+MISC ChangeLog 18703 SHA256 47ecba93a0d060141fd127fed3e4ad0721bdf0968e7535cb086b49d5293b3fdc SHA512 5ca0484419d2eaa6371a60f0bb45e86269aff11cc0545d3d93f85b4766ef81cb542f1106c87c21daa16a2748acd8374ae1f446d7ea011f76249b31d217375168 WHIRLPOOL 9bf1845d5f5f528ae1dfe945288c00bbebbdd401dcd0266d5229ad1ecadef0f0f1a2fd2b15e2f61467e7d6b383b3a0bb0c5ce1b15575b7b93af9764461a26f6b
 MISC metadata.xml 1918 SHA256 5cdd92581b4e46c8dc3c468f51bf04dd5456dbddc1f4f88fef47879953f35d88 SHA512 0dd12af812f22da964152898a256c957e2074d1ae9eb2f8dd471f8f3cfb0016439271636759b622756d67f0eadfc5f062556ff5f85be4445c03dc5fe097814e4 WHIRLPOOL 1c232cc5d306a62507be40fd18552a284e87ae2a10e920d4cc3886ea59e4bc075a0ce9636eb15f6d59fb07bfc29cf5b503b87b8425a275b079d4e91ffdf2ec78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS26Y3AAoJELp701BxlEWfVckP/RytwABo/AmB0QQlf40jAOrv
-tQ5rolUiFdfXnHpfHkZql3OCPOsVgwZU5aaDMPKvXz9xDuF49m4seZ4FzpFZVVBl
-IxvolUfwQTEuy0DvNmL1TPOKEv+1lb4cA7T7Xu7Ba4Hw1qla1XG9l53o82eGR7eg
-hmrm2VEF8mj3lPn8nu3w7HXgPI9tSm4lOWHKdyW6z12DHBJTFNwfnewEEO5/yGZf
-Dpf3hfmb2ZDRoQx5rqmmKiRtrzpX2k9W0zczCrgFL9ZEu3blerPpEtAfedAtTZF0
-+kLC1r7/GL3x3LbZBjljb2lxOATWOxGADjOBtqPo1bAgr+k+FBiAN1LSpDNf7Suj
-zp48qcH6t7u4cEzgHzrVBLoUsmab6tW9dsdZpWEggbRQjds8RINphn/TvnqmDGYy
-gWxgtwokfnG9RhTEGeTdHKdlsJlMcgsnt2NlcmgoiEqCZvC+MPU4hMiWd5gjDSD6
-h9g6x6sG4PU26tZhGkc5X9L9lKMu0967qZ78+DI5pqfeXEquvYhkIWU6lKVJjYLA
-uWFbLMann7w8Sscw7KD32+fO5o6DJh4ZljCp5jq0D46ggQ2xPOr0eO2xWlzBqb++
-5/AZZV0NkQCJNmd0nAb/Y8LR80nbb8XKfX+hTkw9YJKC0GHLPe6zDIS22CQDy/rE
-41lNbYjNk0k9AEJOgw0+
-=JkLI
+iQEcBAEBCAAGBQJS989AAAoJEH8qFnJlIeBtgsIH/09LlZxOs4RfaaNFx/ZSHNnG
+c5kUcHzXh0t9af4o/ZQ9/YjRT6c1piPzU/2GHhVqKz+Yw3x3D0snx77/o/K6x8Xv
+Sh3QtPeWoH91jrNz/lTF4wTCSAO465Q2IdPb0ohnY0TR8659NzQHaYxftJs0Xl+L
+OIE4h6mAxWnokL5XWaGjXJruW9ZAc2Fqf6cijwWzuiikhjyDvPCZ75uFTNqYwz00
+ni3G+i2NUGb/flFklw5j8H3G/N2Ly7btodQDTepyZz1eX0/iSXDNAOvTdTkLInQD
+Y65ZXAO+Qr9lbx5Qhh0v0QmnHdXOrceTvPjuuMMKECOuHMwVjnoBuvjFNOa1ZKA=
+=9X4w
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-5.0.ebuild b/app-accessibility/brltty/brltty-5.0.ebuild
new file mode 100644
index 000000000000..f8f36f2d65f0
--- /dev/null
+++ b/app-accessibility/brltty/brltty-5.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0.ebuild,v 1.1 2014/02/09 18:55:59 teiresias Exp $
+
+EAPI=5
+
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	autotools udev systemd
+
+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/archive/${P}.tar.xz"
+
+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 \
+		"${FILESDIR}"/${P}-respect-AR.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() {
+	tc-export AR LD
+	# 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
+
+	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 Autostart/Udev/udev.rules 70-brltty.rules
+	newinitd "${FILESDIR}"/brltty.rc brltty
+	systemd_dounit Autostart/Systemd/brltty.service
+
+	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-5.0-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-5.0-fix-ldflags.patch
new file mode 100644
index 000000000000..e60ea9a4e509
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.0-fix-ldflags.patch
@@ -0,0 +1,56 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -377,7 +377,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
+-      brltty_mkmod_ld_make="-shared"
++      brltty_mkmod_ld_make="-shared ${LDFLAGS}"
+       ;;
+    solaris*)
+       brltty_mkmod_ld_make="-G"
+@@ -404,7 +404,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
++   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
+ else
+    brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
+ fi])
+@@ -414,7 +414,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*)
+-      brltty_mklib_ld_make="-shared"
++      brltty_mklib_ld_make="-shared ${LDFLAGS}"
+       brltty_mklib_ld_options="-soname"
+       ;;
+    solaris*)
+@@ -449,7 +449,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
++   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ else
+    brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
+ fi])
+--- a/Bindings/OCaml/Makefile.in
++++ b/Bindings/OCaml/Makefile.in
+@@ -55,13 +55,13 @@
+ all : $(OCAML_FILES)
+ 
+ $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
+-	$(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ 
+ $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
+ 	$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
+ 
+ $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
+-	$(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ 
+ brlapi.cmi: brlapi.mli
+ 	$(OCAMLC) -o $@ -c brlapi.mli
diff --git a/app-accessibility/brltty/files/brltty-5.0-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.0-respect-AR.patch
new file mode 100644
index 000000000000..09ae62973c2e
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.0-respect-AR.patch
@@ -0,0 +1,12 @@
+diff -Naur brltty-4.5/Programs/Makefile.in brltty-4.5-new/Programs/Makefile.in
+--- brltty-4.5/Programs/Makefile.in	2013-03-27 15:51:35.000000000 -0700
++++ brltty-4.5-new/Programs/Makefile.in	2013-09-19 14:57:56.268106076 -0700
+@@ -387,7 +387,7 @@
+ 	[ ! -f lib.def ] || mv lib.def $(API_DEF)
+ 
+ $(API_ARC): $(API_OBJS)
+-	ar rc $@ $(API_OBJS)
++	$(AR) rc $@ $(API_OBJS)
+ 	$(RANLIB) $@
+ 
+ brlapi_client.$O:
diff --git a/app-accessibility/brltty/files/brltty-5.0-udev.patch b/app-accessibility/brltty/files/brltty-5.0-udev.patch
new file mode 100644
index 000000000000..6500a2af8ed6
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.0-udev.patch
@@ -0,0 +1,28 @@
+diff -Naur brltty-5.0/Autostart/Udev/udev.rules brltty-5.0.new/Autostart/Udev/udev.rules
+--- brltty-5.0/Autostart/Udev/udev.rules	2014-01-27 10:39:20.000000000 -0800
++++ brltty-5.0.new/Autostart/Udev/udev.rules	2014-02-09 04:24:08.146802299 -0800
+@@ -174,20 +174,22 @@
+ # FreedomScientific [Focus Blue]
+ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
+ 
++# Seika rules are commented out, because they conflict with USB-to-serial
++# converters.
+ # Device: 10C4:EA60
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge / myAVR mySmartUSB light
+ # BrailleMemo [all models]
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,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_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 1C71:C005
+ # HumanWare [all models]