Fix for bug #155887.

Package-Manager: portage-2.1.2.9

4 files changed, 33 insertions, 15 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 8f92d1bcbf9c..f96f3cb8c310 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.53 2007/03/29 02:24:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.54 2007/06/01 06:54:21 williamh Exp $
+
+  01 Jun 2007; William Hubbs <williamh@gentoo.org>
+  +files/brltty-3.7.2-linux-compiler-h.patch, brltty-3.7.2-r1.ebuild:
+  Added the patch from fedora to fix bug #155887.
+  Also cleaned up the dependencies.
 
   29 Mar 2007; William Hubbs <williamh@gentoo.org> brltty-3.7.2-r1.ebuild:
   Fixed a typo that prevented installing the startup script.
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 368a36355c29..e47b1c03fc63 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,3 +1,7 @@
+AUX brltty-3.7.2-linux-compiler-h.patch 360 RMD160 02e90d1e05a2ac2a0be02fd18af8babefd26ef48 SHA1 1fbba9a718cc7e9dc2e8ac169ee329c18008f728 SHA256 7afbd7e504082398e754f54574a93a5658f9d2cebd7944b10e89b5ac7b130a2c
+MD5 7a0089fe9e43896e8963170b51b16a29 files/brltty-3.7.2-linux-compiler-h.patch 360
+RMD160 02e90d1e05a2ac2a0be02fd18af8babefd26ef48 files/brltty-3.7.2-linux-compiler-h.patch 360
+SHA256 7afbd7e504082398e754f54574a93a5658f9d2cebd7944b10e89b5ac7b130a2c files/brltty-3.7.2-linux-compiler-h.patch 360
 AUX brltty-3.7.2-nostrip.patch 324 RMD160 234256bff56637ae609b0cfd06eb593c761fb7c0 SHA1 3e3653f3dc48ab7a149149670c4f8694fa5031d8 SHA256 3afdb8a1506abd94e1770271fe2b57d2027774041e1788e862a68fb4faeae428
 MD5 ed33f06374ffd30ac45d765200cb3f53 files/brltty-3.7.2-nostrip.patch 324
 RMD160 234256bff56637ae609b0cfd06eb593c761fb7c0 files/brltty-3.7.2-nostrip.patch 324
@@ -22,18 +26,18 @@ EBUILD brltty-3.6.ebuild 883 RMD160 4ed8107ddd8b3014cfe017de13ac77a9ca3eb043 SHA
 MD5 5ce1e793de71daf22e755f423a8213d0 brltty-3.6.ebuild 883
 RMD160 4ed8107ddd8b3014cfe017de13ac77a9ca3eb043 brltty-3.6.ebuild 883
 SHA256 90f7ca54b3961f8e1053f20a526eba59191f917e4d17f6471f705119a997f064 brltty-3.6.ebuild 883
-EBUILD brltty-3.7.2-r1.ebuild 1713 RMD160 0cb2d39be86fcea1b2aed37e60f224d989ddaa28 SHA1 ebc3b571b4b1f57233923556ff97648b029f2472 SHA256 89e64d1d98bbd357fce047da74a0a4649f2c28d3cc3494e33298c9a098f1c3f8
-MD5 1d9cf200ca9281b8be59e89e6c3b5aa3 brltty-3.7.2-r1.ebuild 1713
-RMD160 0cb2d39be86fcea1b2aed37e60f224d989ddaa28 brltty-3.7.2-r1.ebuild 1713
-SHA256 89e64d1d98bbd357fce047da74a0a4649f2c28d3cc3494e33298c9a098f1c3f8 brltty-3.7.2-r1.ebuild 1713
+EBUILD brltty-3.7.2-r1.ebuild 1675 RMD160 62eec171722dfab13b146747ffaf5a1c4f16db69 SHA1 905e5d9666fd24a30eca0ee46f5c49fcd35ee592 SHA256 ead49a20474560580077545fb63b8ae806b2a2a19a50755b45715de3b960acf8
+MD5 4f6891b8ebcf409df4e301b4dd5922cc brltty-3.7.2-r1.ebuild 1675
+RMD160 62eec171722dfab13b146747ffaf5a1c4f16db69 brltty-3.7.2-r1.ebuild 1675
+SHA256 ead49a20474560580077545fb63b8ae806b2a2a19a50755b45715de3b960acf8 brltty-3.7.2-r1.ebuild 1675
 EBUILD brltty-3.7.2.ebuild 1401 RMD160 2c883a622c564da39215db0fc6a725d9e2533d9f SHA1 097859a6d63f06b36d97fc553dfe521b794d369f SHA256 b91b82904625735314eb96f4f312327b810662733ef1b2048e47b3f9cd2b772f
 MD5 525bbdef3d9250becf7eb2faaaada400 brltty-3.7.2.ebuild 1401
 RMD160 2c883a622c564da39215db0fc6a725d9e2533d9f brltty-3.7.2.ebuild 1401
 SHA256 b91b82904625735314eb96f4f312327b810662733ef1b2048e47b3f9cd2b772f brltty-3.7.2.ebuild 1401
-MISC ChangeLog 6351 RMD160 fe350604ac3ccdac482eaaf453dc25af20d2f8ef SHA1 d0cce91f573bb501ef97a399849765aadc253ee3 SHA256 0ea49413fd6e2797efd1c53913d02ce7037021d672fe01a2a8c2188caaadd102
-MD5 d1b4c65710937248731e9ea6eeff295a ChangeLog 6351
-RMD160 fe350604ac3ccdac482eaaf453dc25af20d2f8ef ChangeLog 6351
-SHA256 0ea49413fd6e2797efd1c53913d02ce7037021d672fe01a2a8c2188caaadd102 ChangeLog 6351
+MISC ChangeLog 6559 RMD160 41d9093435f2b3f9614ae21ce38e3f6ad38c522e SHA1 6016c29a95ddfe724d076939e06f34b9949408cd SHA256 78cb92e38ecd82594b83bd0e0c3d2a74b735b9c643251016785ab0d9cdfce4be
+MD5 c7bfd0d5c6d50f19a6923aa137f62511 ChangeLog 6559
+RMD160 41d9093435f2b3f9614ae21ce38e3f6ad38c522e ChangeLog 6559
+SHA256 78cb92e38ecd82594b83bd0e0c3d2a74b735b9c643251016785ab0d9cdfce4be ChangeLog 6559
 MISC metadata.xml 1369 RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 SHA1 551fae162278c8600c1a4547184e17af9eca5bb4 SHA256 263e4d610a1ed22f4f7176a3759194490e4a1b9d02f339c149c4a462524a63be
 MD5 e385ac1a0787152b5b9dfb9c2fa24681 metadata.xml 1369
 RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 metadata.xml 1369
diff --git a/app-accessibility/brltty/brltty-3.7.2-r1.ebuild b/app-accessibility/brltty/brltty-3.7.2-r1.ebuild
index 6391b90fcc5e..eb362b9cef07 100644
--- a/app-accessibility/brltty/brltty-3.7.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-3.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.7.2-r1.ebuild,v 1.2 2007/03/29 02:24:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.7.2-r1.ebuild,v 1.3 2007/06/01 06:54:21 williamh Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -13,17 +13,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc gpm usb X"
 
-RDEPEND="virtual/libc
-	gpm? ( >=sys-libs/gpm-1.20 )
+DEPEND=" gpm? ( >=sys-libs/gpm-1.20 )
 	X? ( || ( x11-libs/libXaw virtual/x11 ) )"
-DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}"/${PN}-3.7.2-nostrip.patch
+	epatch "${FILESDIR}"/${P}-nostrip.patch
+	epatch "${FILESDIR}"/${P}-linux-compiler-h.patch
 }
 
 src_compile() {
diff --git a/app-accessibility/brltty/files/brltty-3.7.2-linux-compiler-h.patch b/app-accessibility/brltty/files/brltty-3.7.2-linux-compiler-h.patch
new file mode 100644
index 000000000000..ef7ce5b9214d
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-3.7.2-linux-compiler-h.patch
@@ -0,0 +1,11 @@
+--- brltty-3.7.2/Programs/usb_linux.c	2006-07-12 13:27:57.000000000 +0200
++++ brltty-3.7.2/Programs/usb_linux.c	2006-07-12 13:27:28.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/stat.h>
+ #include <sys/vfs.h>
+ #include <sys/ioctl.h>
+-#include <linux/compiler.h>
++// #include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ 
+ #ifndef USBDEVFS_DISCONNECT