Fixed bluetooth dependency for bug #272735.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 12 insertions, 8 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index b5dddf70da43..6032e2ac525e 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.89 2009/05/18 13:35:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.90 2009/06/11 11:35:31 williamh Exp $
+
+  11 Jun 2009; William Hubbs <williamh@gentoo.org> brltty-3.10.ebuild,
+  brltty-4.0.ebuild:
+  Fixed bluetooth dependency for bug #272735.
 
 *brltty-4.0 (18 May 2009)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 82d1bcc88d9b..3fbc357e59d5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -6,7 +6,7 @@ AUX brltty-4.0-api-socket-dir.patch 562 RMD160 8f037ae75107ce3b7a4c82fe33509b5e0
 AUX brltty.rc 535 RMD160 495be64b538963fe2cc7e85123a1d02a88078583 SHA1 faa41ace7feb80ce679cb47980a361bceb0cc148 SHA256 099077395b2160f3d7f73cb8df647675ad1cf8359961154f08ae9febf725eb55
 DIST brltty-3.10.tar.gz 1919631 RMD160 e8c4cfccb52eea4db86544d1ff218a4bdfef7615 SHA1 360a82d0c99a639fb15614c2abf7273dbead9a4f SHA256 8356287002a7b736969b9dcd92944817dda77f57349acfaac621fa415b674e06
 DIST brltty-4.0.tar.gz 2135287 RMD160 fb998ebe16971962d106140751a9037f5b32b80c SHA1 a966e0818bf2cc6927c7bd1e3ae52f9bbf13b031 SHA256 961ce89057600852674dc199f18d135261f27442e7ff69c767a12a9e07ca01ce
-EBUILD brltty-3.10.ebuild 3099 RMD160 5788066e2cb37deaeb2e56368dc0f9f937c75042 SHA1 2894b67a7cd0c5fb62f0777ca9c7898df7cd0401 SHA256 0cc2765cd36aa7ab89e57468a2ef65b766435c94e8abe9a2b659ad1671d3b703
-EBUILD brltty-4.0.ebuild 3192 RMD160 ad5516ad66880e92cc9aabc616003e11c2fd2cb4 SHA1 f4c804cb46f641fa42e13625fdecc1f85bc7755f SHA256 e9eeeeff9d087684c830ce8482de2e894c7e4a7be8f96844383017585b57781e
-MISC ChangeLog 11056 RMD160 3604a62ccd9a5506be9a4851695ed8bcb0be6d6a SHA1 09dbd743959426ccfea8714cdca74002167ac4c9 SHA256 f7e923cc841b3804793cdf300a27d1eb191c30a970e3644b4d96677821bcc90e
+EBUILD brltty-3.10.ebuild 3126 RMD160 0b3fa1bd8805b16661430543c1b626326dfdfabf SHA1 929b7d9c433c8ea90061540ff977fe827f4c0807 SHA256 7edc69108ea252f21ef206cfb808c399d9e393a519f0ef8a4dbcc6b8d9b0fa43
+EBUILD brltty-4.0.ebuild 3218 RMD160 5abafd40ee30b98ce52083eadc08dcde60d187cd SHA1 8225cd815fb0dbe06a61b0128287a708d01f9787 SHA256 601fd93ca7416678ca70bc9a18b6c2e70c24b380acc973f8a636d37d2653d837
+MISC ChangeLog 11195 RMD160 d4da0ca6c05119b7d147e07dcd74d4e86261ed4f SHA1 9354ca0d8b50958730c819fcda029c9afb8b6e3f SHA256 be451ab069b6ca5edc9de15bffc83b7fdd574abdf14174ab288a076f790bb964
 MISC metadata.xml 1369 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a SHA1 0b429c95350460c3a22ba05c7894b519e7a046dc SHA256 66e8c95b51326f8a993ce54b41590035e01d1e81438f6f187ccccb9392cbedf9
diff --git a/app-accessibility/brltty/brltty-3.10.ebuild b/app-accessibility/brltty/brltty-3.10.ebuild
index d5f007e0b852..4214190b13c0 100644
--- a/app-accessibility/brltty/brltty-3.10.ebuild
+++ b/app-accessibility/brltty/brltty-3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.10.ebuild,v 1.10 2009/05/17 18:32:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.10.ebuild,v 1.11 2009/06/11 11:35:31 williamh Exp $
 
 FINDLIB_USE="ocaml"
 EAPI=1
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
 IUSE="bluetooth doc gpm iconv icu java nls ocaml python usb tcl X"
 
 # libusb-compat untested
-COMMON_DEP="bluetooth? ( net-wireless/bluez-libs )
+COMMON_DEP="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 	gpm? ( >=sys-libs/gpm-1.20 )
 	iconv? ( virtual/libiconv )
 	icu? ( dev-libs/icu )
diff --git a/app-accessibility/brltty/brltty-4.0.ebuild b/app-accessibility/brltty/brltty-4.0.ebuild
index bb9c39da45a4..3251b43c2610 100644
--- a/app-accessibility/brltty/brltty-4.0.ebuild
+++ b/app-accessibility/brltty/brltty-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.0.ebuild,v 1.1 2009/05/18 13:35:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.0.ebuild,v 1.2 2009/06/11 11:35:31 williamh Exp $
 
 EAPI="2"
 FINDLIB_USE="ocaml"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth doc gpm iconv icu java nls ocaml python usb tcl X"
 
-COMMON_DEP="bluetooth? ( net-wireless/bluez-libs )
+COMMON_DEP="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 	gpm? ( >=sys-libs/gpm-1.20 )
 	iconv? ( virtual/libiconv )
 	icu? ( dev-libs/icu )