kdebluetooth: make optional dep on net-wireless/bluez and bluez-libs/utils

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

4 files changed, 19 insertions, 15 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index c83cf862c50a..81ec4a675559 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kdebluetooth
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.74 2009/03/08 01:38:44 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.75 2009/05/10 19:21:54 hanno Exp $
+
+  10 May 2009; Hanno Boeck <hanno@gentoo.org> kdebluetooth-1.0_beta8.ebuild,
+  kdebluetooth-1.0_beta8-r1.ebuild:
+  Make optional dependency on bluez or bluez-libs/utils.
 
   08 Mar 2009; Markus Meier <maekke@gentoo.org>
   kdebluetooth-1.0_beta8.ebuild:
diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest
index 3f4795b616cc..c00266d648dd 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -15,14 +15,14 @@ AUX kdebluetooth.diff 804 RMD160 b02d9c579c7b480de77b95db263188553f2421ab SHA1 a
 DIST kdebluetooth-1.0_beta2.tar.bz2 1228026 RMD160 52d54f49a1eb5c89b2a5ad9550dc6b85d50b62e9 SHA1 0cfc61f4597b599cd3ef668a534c854c55921108 SHA256 9d2637a1e9bb220f048ce62014516418163d2bf92c29835a941eb962154e41b7
 DIST kdebluetooth-1.0_beta8.tar.bz2 1091884 RMD160 84570b1c3335521e4d0f976f91d0237a4b0c1ee2 SHA1 b602e02d26518217bcf1afa5da2e2473c93b81cc SHA256 3f4cf5566446b3cc9f5cdb98304fbefcd0319c0e659d60a75123e8729286f3fa
 EBUILD kdebluetooth-1.0_beta2-r2.ebuild 2202 RMD160 1f90d22f469728075a037482df54ae3c803e8465 SHA1 f2ffa9362cf3682d8cc357b17adb719e252003e1 SHA256 7e443fe31331c4e6bc704048cabc15560e5cbac7bd5342921856ee3209fe2606
-EBUILD kdebluetooth-1.0_beta8-r1.ebuild 1444 RMD160 3a2584864856a32f5ff7aa421d170874b6c43e24 SHA1 b4b4a899be9cbc4797375f28d4e28cac8a1616fc SHA256 d3aaa60e75a9a10614f2ee7e151d1c6fb957c37abcba3016f6e9c329afc55516
-EBUILD kdebluetooth-1.0_beta8.ebuild 1405 RMD160 954e54b40a88839d6221408e0e8ecded227ade95 SHA1 117af82f590949972b3ccab361e435f814efd4bc SHA256 d85fd8df5aa7a44d41d3f680652470e791ac51499696b21e632893dd74c0a52f
-MISC ChangeLog 13028 RMD160 460e1aac453569ea25f32d3d1df0dc3a2e14273d SHA1 fc0a8cebaf2eeff646f8368ad238b2adc188e71a SHA256 6a7a9987d0ae506c941f34f0269ce8999c58ae59d2066544f08187a6e70e8cb0
+EBUILD kdebluetooth-1.0_beta8-r1.ebuild 1474 RMD160 087c0a898c2e8f102ea2c1f8c106626b662d3114 SHA1 e11b3034313daa53c22e5ade2bf907ba058eabf2 SHA256 99f10cf97bb328228440747edea17a09192a4d6b939713d17bc901fd8ba44442
+EBUILD kdebluetooth-1.0_beta8.ebuild 1435 RMD160 4ad174c0f9c4ea3864ef1555f9a014933c99593e SHA1 a365521147036610ef11e06aa1bc31da1622a9fd SHA256 808899c9d73f9419669cbdff966ff314d7e742a8d4d2f7672926a70ffcc10e47
+MISC ChangeLog 13198 RMD160 6450c4cc3e9bb8f356f0e00ded88760ad188455a SHA1 aa9643dfc9eac64b5df56a3d4dafa32931721b66 SHA256 7f10ad9d9037abec002704c8fa2e7752ceb7026517bc8d1fc6411fcdd46b5923
 MISC metadata.xml 252 RMD160 5050aee89a626730668539dee047f9b3e13e6382 SHA1 748125968cc776b5534a4e8a4c4db89ab4333571 SHA256 0e4030fc3b8fd3629227fb2c57e80882c546f9a4087178ce61c4e6f266187b7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmzIawACgkQkKaRLQcq0GJaGwCfSvyqrttFHlrjqFKZFYiBck84
-CZMAn0LCFgtEZWu5SANBZbCakpi5fhcm
-=S8QT
+iEYEARECAAYFAkoHKVUACgkQr2QksT29OyDdZwCgpDVQ+c1DVMrm1hoYJ1MSUEBE
+dUoAoJ5UmbtkTJq7iQ8dzmajTTzecQZ1
+=gcNr
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
index 6e329f284992..5ceb627fd6f8 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.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/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild,v 1.1 2009/03/03 23:11:11 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild,v 1.2 2009/05/10 19:21:54 hanno Exp $
 
 inherit kde
 
@@ -24,8 +24,8 @@ DEPEND=">=dev-libs/openobex-1.1
 RDEPEND="${DEPEND}
 	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
 		=kde-base/kdebase-3.5* )
-	>=net-wireless/bluez-libs-3.11
-	>=net-wireless/bluez-utils-3.11"
+	|| ( ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
+		net-wireless/bluez )"
 
 need-kde 3.5
 
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
index 475d193a45c0..77c9cfb884e5 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.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/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.7 2009/03/08 01:38:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.8 2009/05/10 19:21:54 hanno Exp $
 
 inherit kde
 
@@ -24,8 +24,8 @@ DEPEND=">=dev-libs/openobex-1.1
 RDEPEND="${DEPEND}
 	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
 		=kde-base/kdebase-3.5* )
-	>=net-wireless/bluez-libs-3.11
-	>=net-wireless/bluez-utils-3.11"
+	|| ( ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
+		net-wireless/bluez )"
 
 need-kde 3.5