Fix building with recent glibc wrt #339846 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 28 insertions, 4 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index c028ecfafd6a..0f523721872b 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.106 2010/07/16 22:36:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.107 2010/10/05 17:19:34 ssuominen Exp $
+
+  05 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> brltty-4.2.ebuild,
+  +files/brltty-4.2-glibc-212.patch:
+  Fix building with recent glibc wrt #339846 by Diego E. Pettenò.
 
 *brltty-4.2 (16 Jul 2010)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index d903538710c7..9444b9091120 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,7 +1,8 @@
+AUX brltty-4.2-glibc-212.patch 287 RMD160 7d12d6e7b0311d9e205b5619d08cf27095322828 SHA1 c3ad4b457acad0808b8aa68ad1a05ad6f8a9247f SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516
 AUX brltty.rc 530 RMD160 60f5f91fbdba71954685330b9e2c4db1e2c1090f SHA1 5e4ddda21ef8d3eb04199f262006a589e8d08c2f SHA256 c6899cab19f94feb83030c9df4541a025891869d72009bac944b3cd3535a24c2
 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 3586 RMD160 947313930fab2ac5348b58f2f3111610f3ff963c SHA1 2ca4a2eff449b7e0e89bc1d2d8b85ffc04be47f9 SHA256 4f7a2cea9a3a137c61fbba58bb242b45a6c9bcccece5487e2c889bb1a2a85574
-MISC ChangeLog 12851 RMD160 b6ef7e79571e8aba556c292086f89049cca4f749 SHA1 33956e24cf3dcd0070c73bc7f110ebc631059079 SHA256 a57bb7f7623cfa644c1e1c8e7108b0bcf8991ea00c8de569cdeb70055cc8f035
+EBUILD brltty-4.2.ebuild 3678 RMD160 54934c13848d1e2980f6ea56665c934eb4904bfe SHA1 3710322482239affbfad7686c54fc9126516bdf7 SHA256 a221baa7b0db0060c144d31d40ca68505971f963023ede1538817ef08ece78e6
+MISC ChangeLog 13030 RMD160 1d863e538c84fc509153a2bcbe84c95bb62e63ed SHA1 8da032570c5cb9fccdc43d88c93d4f2324cef301 SHA256 de84f56bbf40f0c2da7f27e0face41e362da9a83a22c59fdeb4aea1de5a8edc6
 MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index 872a8308aeb0..f405484fe84c 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1 2010/07/16 22:36:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.2 2010/10/05 17:19:34 ssuominen Exp $
 
 EAPI="2"
 FINDLIB_USE="ocaml"
@@ -32,6 +32,12 @@ DEPEND="java? ( >=virtual/jdk-1.4 )
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	${COMMON_DEP}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-212.patch
+
+	java-pkg-opt-2_src_prepare
+}
+
 src_configure() {
 	# override prefix in order to install into /
 	# braille terminal needs to be available as soon in the boot process as
diff --git a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
new file mode 100644
index 000000000000..20e472d305e0
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/339846
+
+--- Programs/sys_linux.c
++++ Programs/sys_linux.c
+@@ -22,6 +22,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/types.h> /* sys/stat.h */
++#include <sys/stat.h> /* S_ISCHR */
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+