dev-libs/libwiimote: Fix bluez dependencies

svn path=/sunrise/; revision=12274

diff --git a/dev-libs/libwiimote/ChangeLog b/dev-libs/libwiimote/ChangeLog
index 30e906994d24a0bc2812937ae0e7d4138383c39c..442a6646ce740b3e29ce931cb7d405a699dfb5f9 100644 (file)
--- a/dev-libs/libwiimote/ChangeLog
+++ b/dev-libs/libwiimote/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-libs/libwiimote
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  libwiimote-0.4.ebuild, libwiimote-9999.ebuild:
+  Fix bluez dependencies
+
   07 Sep 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
   +files/libwiimote-hci.patch:
   tilt and force aren't supported as configure option in 9999

diff --git a/dev-libs/libwiimote/Manifest b/dev-libs/libwiimote/Manifest
index 72cc9807e6a6d40a8467ef33eb32e1266449c4f0..d3b0f973db27888afb62ee833364c33352fc4360 100644 (file)
--- a/dev-libs/libwiimote/Manifest
+++ b/dev-libs/libwiimote/Manifest
@@ -4,7 +4,7 @@ AUX libwiimote-as-needed.patch 923 RMD160 93a66b8099ed00f4b727766d68ea0b507d4646
 AUX libwiimote-hci.patch 384 RMD160 0cfc419e4c768715c57bc65e315f142f525231ef SHA1 5e9cb2906f1adcb08cc131d60ab4fe6986cc34ac SHA256 95475fe9bebc4a0697935b93ad5b3871276ea9e92b511fa954299d502931a61d
 AUX libwiimote-include.patch 357 RMD160 9801643a90a2b0ec4bc3fa037eba8b9b0d4ee0b6 SHA1 8f6b04cd54e614936ab729e1cd80341e50e17800 SHA256 76804a3dd29795e83d4524ef7f99584fc2719c57bd21ae0204be9763fd6b6a32
 DIST libwiimote-0.4.tgz 30857 RMD160 4fefc82cd577404a9aefda2d40144cb2c6d9c6c8 SHA1 79b1639d481b35eb6df7b83877f9438944ec389c SHA256 a1e9d45a0d4dd367f1371dd477e30ecaa95e59b9fb8635dc9e7f26e4eb231d90
-EBUILD libwiimote-0.4.ebuild 950 RMD160 3c0279535645e1e73a4e1560e3f98409b3d1c80a SHA1 5df0134fda538d7534c83f24cc1988ef7f5dce3d SHA256 c5dc93155233a70cec29b6e4a19ced82701f1281189846a1d71ef5c0542d9bac
-EBUILD libwiimote-9999.ebuild 870 RMD160 16aff036a6ac8b45f41dfd23495dfcf3d92d8fdb SHA1 a6f8d4425fcf04679c4dfe9f759c073319468629 SHA256 566dc896bc7b1285153ebecc99161aaf1b00b6f2852e2999cd05c005e7cea5c5
-MISC ChangeLog 2189 RMD160 2fb4f5c904c6c4970314a80e80f6485a080471d8 SHA1 bd8cc2c52559dbcbd2b991d2040df91e3e8d8d4c SHA256 2478bfd6f85dcbbfe24c8081d18b2414a68ed3c111c6c42a049d360441b34b62
+EBUILD libwiimote-0.4.ebuild 880 RMD160 2232a87a50a0e2d97ec1f7ac8c55ac54318a3451 SHA1 f410330d011ce508d8fd0092214da29448c2219a SHA256 402b0e73e48ad8fa6b4899b22f6a5f1598b7ac7d6ae977862356dcba3413f702
+EBUILD libwiimote-9999.ebuild 839 RMD160 ff33cbf3cc00738d9f6df22c7da34c7638376bb8 SHA1 d23ac13a3581c2c5ec0bc8420b6fca6a137ffd79 SHA256 ff06ccd8baa2ec4d4961a5f304b94258cc78a414e377c5521017c375474005e8
+MISC ChangeLog 2323 RMD160 47a5c22a7b4709e4d2bd1d558a08bcb92d9fd28f SHA1 66ad3b98b2baac85ed9f8f225ae19c37143c805a SHA256 a61cbd3c2fbb66a33053162aa991cf3ffb4698e9290aac274ee53112b34b0429
 MISC metadata.xml 335 RMD160 9305e8fe4a69685bcf8678e88d15567d4fc18c73 SHA1 85338b0c7f1fc5e69366ddff0d92c1ec6a8ccd07 SHA256 c6f5149100301e3f3e3b698bdd5beea052e5ee207a0923e23a2b20f9e92aa9a2

diff --git a/dev-libs/libwiimote/libwiimote-0.4.ebuild b/dev-libs/libwiimote/libwiimote-0.4.ebuild
index 8b3bae37d5416da43ce62cd50dc1bc5c81fcb7f8..362d309162f9d43748867b0e684d98270f3bc9c8 100644 (file)
--- a/dev-libs/libwiimote/libwiimote-0.4.ebuild
+++ b/dev-libs/libwiimote/libwiimote-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,10 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples force tilt"
 
-RDEPEND="
-       || ( net-wireless/bluez
-               ( >=net-wireless/bluez-libs-3
-               net-wireless/bluez-utils ) )"
+RDEPEND="net-wireless/bluez"
 DEPEND=${RDEPEND}
 
 src_prepare() {

diff --git a/dev-libs/libwiimote/libwiimote-9999.ebuild b/dev-libs/libwiimote/libwiimote-9999.ebuild
index f00f404bb60c8b80b12ecfdbcdd7c2467a833d63..aabc2669e5acd8d9611e7a731792c0fb2d28492a 100644 (file)
--- a/dev-libs/libwiimote/libwiimote-9999.ebuild
+++ b/dev-libs/libwiimote/libwiimote-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples"
 
-RDEPEND="|| ( net-wireless/bluez-libs net-wireless/bluez )"
+RDEPEND="net-wireless/bluez"
 DEPEND="${RDEPEND}
                dev-util/pkgconfig"