apply patch from upstream for #362857.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 28 insertions, 8 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 721b54b7bc09..7352944fd773 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.118 2011/04/10 12:49:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.119 2011/04/11 21:37:37 williamh Exp $
+
+  11 Apr 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild,
+  +files/brltty-4.2-fix-a2.patch:
+  apply patch from upstream for #362857.
 
   10 Apr 2011; Tobias Klausmann <klausman@gentoo.org> brltty-4.2.ebuild:
   Stable on alpha, bug #358503
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index ae9ca66ee9cb..76be96f09c1f 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX brltty-4.2-fix-a2.patch 445 RMD160 cbd2c31131e2101ab1153d59f3fea808f220954a SHA1 3b65e263e4f1d66fa8bc571f02afcfb6f1ead8a8 SHA256 01e9dcb3a0e758b33e0bc8e704769dc17dd09223a5739d1df48f7cf0c965a221
 AUX brltty-4.2-fix-ldflags.patch 2404 RMD160 64b5d89e0aab2c90895f055d54410b8081097473 SHA1 8afc9434f125a1665e7ea5388a911750274dc927 SHA256 5ebc7140937b3f2e43a8c7cd20a8ca5269d2874e150fcb65336d42b8f92e369b
 AUX brltty-4.2-fix-ocaml-install.patch 842 RMD160 72835d59022dc0fb2e865d7dab21a8b8f6427e40 SHA1 598e78ca4573eb75c4a8092afde12bf6494efb65 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284
 AUX brltty-4.2-fix-svnversion.patch 918 RMD160 02a655d945d137ae81e72b4f988f8885d7c7a296 SHA1 42244c20a9678306b7cc060142a7b2ad0b02f374 SHA256 7ea5ba1d7521bc2382629c023dc862acd6b2a9ed1c059274cbcd218a4aa8a9fa
@@ -9,13 +10,13 @@ AUX brltty.rc 530 RMD160 60f5f91fbdba71954685330b9e2c4db1e2c1090f SHA1 5e4ddda21
 DIST brltty-4.1.tar.gz 2169303 RMD160 a46c0e42dd3504b6b3ef24309042d2915dee770a SHA1 3e81746cb1e455ca5116d11fcce1e158371146df SHA256 29d0bd271ed3b8ec92c378bdf90489936c26d375515aa326f74bd515dfcb36a4
 DIST brltty-4.2.tar.gz 2234191 RMD160 f099f92c8e44f1cedf20a70e8b874796bae9daab SHA1 d25802d08599b75841e7bb2f29bc88737f2992d2 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2
 EBUILD brltty-4.1.ebuild 3594 RMD160 0e6b376b8d516c81478fe75c42cb922b9e6caad2 SHA1 6cd75f7ca050e3edca3a39b224cc0a7d226b0862 SHA256 8a4798cd09531abf24a8ff2677e9b9a94338c1ab297a839bf2b53f468f8500f9
-EBUILD brltty-4.2.ebuild 4138 RMD160 77d5c11ee03381d808f4195098d60cdacaf58a08 SHA1 b17af7bc73e0e5856dd51c7a3eeabdd4de3b72ae SHA256 d0003602117b895f3d00b303b9ea22b70be58572b6e6a3f2ee04fe45336df3a1
-MISC ChangeLog 14580 RMD160 b5b944e7aa27f268d62a676b3900018ffd774ee8 SHA1 2a3b5e5623a2f02aaee55687edce57968911be72 SHA256 aff0b8ea210ad016a0adf79d76961586e8d5771aa577ebf713f71331d6e0b034
+EBUILD brltty-4.2.ebuild 4149 RMD160 cdb8ea451aed52b5e2baca54cf548e3f9bc4a807 SHA1 c13fa6203b06c89f506a1cc320245c230aef9fde SHA256 163676cd505fe93d2e8a50494ecdc1b049ca2fd76992f3f9290ba414d681e43a
+MISC ChangeLog 14726 RMD160 b8768a45991bc2c407927d89476faa0c96166ba1 SHA1 28b56ec9edd71887432317600ed96b32e178f5ff SHA256 09ad2815ccc33336396b73eaacd65cf2596275186c9154848abed84ea9851968
 MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2hp0YACgkQA+4Doc5dVOigRgCfdvMjTl/yodQ1Q0WkNfEDlINs
-fEAAn2HRQnrTNkwFtSJWsfZWeMje9jnc
-=QKQf
+iEUEARECAAYFAk2jdHUACgkQblQW9DDEZThkVACgmryw0p0ecfVN7oe2Y4vXtRYP
+vM8AmL14TtPh3P0m3dMShVHpz2vo67s=
+=Yq0h
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index 8527eb6fcdbb..c8195dc44c3d 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.13 2011/04/10 12:49:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.14 2011/04/11 21:37:37 williamh Exp $
 
 EAPI="4"
 FINDLIB_USE="ocaml"
@@ -39,6 +39,7 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 	${COMMON_DEP}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-a2.patch
 	epatch "${FILESDIR}"/${P}-fix-ldflags.patch
 	epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch
 	epatch "${FILESDIR}"/${P}-fix-svnversion.patch
@@ -65,7 +66,6 @@ src_configure() {
 		--localstatedir=/var \
 		--disable-stripping \
 		--with-install-root="${D}" \
-		--with-screen-driver=-a2 \
 		$(use_enable api) \
 		$(use_enable beeper beeper-support) \
 		$(use_enable contracted-braille) \
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch b/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch
new file mode 100644
index 000000000000..55510523c7aa
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch
@@ -0,0 +1,15 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 5483)
++++ configure.ac	(working copy)
+@@ -1455,7 +1455,9 @@
+ ])
+ 
+ BRLTTY_HAVE_PACKAGE([dbus], ["dbus-1 >= 1.0"], [dnl
+-   BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)])
++   AC_CHECK_HEADERS([X11/keysym.h], [dnl
++      BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)])
++   ])
+ ])
+ 
+ BRLTTY_ARG_DRIVER([screen], [Screen])