dev-libs/libwiimote: Fixed dependies for >BlueZ-3

svn path=/sunrise/; revision=9192

6 files changed, 39 insertions, 37 deletions

diff --git a/dev-libs/libwiimote/ChangeLog b/dev-libs/libwiimote/ChangeLog
index 4afd4c6af..30e906994 100644
--- a/dev-libs/libwiimote/ChangeLog
+++ b/dev-libs/libwiimote/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+  We can depend on newer BlueZ (>3) in both ebuilds
+
   24 Aug 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
   libwiimote-0.4.ebuild:
   Drop unpack phase because already implicitly defined by src_unpack(),
diff --git a/dev-libs/libwiimote/Manifest b/dev-libs/libwiimote/Manifest
index aa3468683..9ef363c48 100644
--- a/dev-libs/libwiimote/Manifest
+++ b/dev-libs/libwiimote/Manifest
@@ -1,9 +1,10 @@
-AUX libwiimote-9999-ldflags.patch 1375 RMD160 f86c512876f8a492e8a1d1b639b139164e795cd2 SHA1 edf386958b381d668f63184c310dacd15dfa7c79 SHA256 0c0a7eb5d527e68db90db995bf5699bcc4cccaef66e0bfe4e585795c0f0b2d0a
+AUX libwiimote-9999-ldflags.patch 1181 RMD160 9306fe246587711f8c8a5cd936826da8bf03bdce SHA1 557b65604bbce46769ad6118a988130aa8d34e68 SHA256 e958559fd0bab00df60eabbe28c25376bf7669ceeec2b5bafdf5abd989a0d753
 AUX libwiimote-amd64.patch 397 RMD160 b51df3594b6f2c2e1d3772abb1cf663db1d5243d SHA1 f34d5ffdb87d78118399af5e3cb2f91772fe962e SHA256 bb100931e55920017247e4835e153b8c370a8490a8a451e56af6669aa14b4a02
 AUX libwiimote-as-needed.patch 923 RMD160 93a66b8099ed00f4b727766d68ea0b507d46469c SHA1 6db1b44f24449f35d2320df35eab89ce341addfd SHA256 23f1a4e45883ed6f981ae67619ecd7aebb3ea23ba581cfe234ba22e1363a2d37
+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 907 RMD160 33109abd397577ca56466f5f6d664a9ac8ae0a75 SHA1 ff60c2f1817bb315a7be166c89b85a13dde115b7 SHA256 972b9e4de416f46a53e349d870fe4dca1148f7ae76727819d881d39373dc4151
-EBUILD libwiimote-9999.ebuild 958 RMD160 d1a1e78f3706dd32bbd4f8bebaae6abf830b01f6 SHA1 19eb509314f8c2dde64ff217ddbdf081c6455806 SHA256 d5f6ea46e622f38f09681a608ca5d1f869a7e01e9669335027990ac1d95f7462
-MISC ChangeLog 1986 RMD160 a05ade9579783c975681ab343d03aa624f3215fc SHA1 1a446a74d6f83eff177576461deef2c1dbe4d37c SHA256 c419ae4022c032239f5f9765be9816bd79abf0ffabb9ccc3f79f22c8874c300c
+EBUILD libwiimote-0.4.ebuild 950 RMD160 9220c163e0b803dd6551274d3839b7e846364b63 SHA1 b664b4580b7e033133de1d8330dea162b05c4560 SHA256 3a9089a6a166035cbf2b8f98f66776203e48539146598192d0ed2a0d7ecae387
+EBUILD libwiimote-9999.ebuild 870 RMD160 114d16243e0e28cc2818c67632234a555750c251 SHA1 c0a319af518385b09bb184fc13b7fd31af62713f SHA256 3f167f97a2298a900cfae97382f621bdfb851a39207ee0eec96bec2a36280019
+MISC ChangeLog 2189 RMD160 2fb4f5c904c6c4970314a80e80f6485a080471d8 SHA1 bd8cc2c52559dbcbd2b991d2040df91e3e8d8d4c SHA256 2478bfd6f85dcbbfe24c8081d18b2414a68ed3c111c6c42a049d360441b34b62
 MISC metadata.xml 275 RMD160 c111feefe14c36ba94ddd904e24dea6f19a12748 SHA1 66e48e9d66dd5ae0a956587684c072e3dd413855 SHA256 9f81f7cbf4938900844df0962ecc0694b58ca689e9a889fb9936d71ecd29f4c2
diff --git a/dev-libs/libwiimote/files/libwiimote-9999-ldflags.patch b/dev-libs/libwiimote/files/libwiimote-9999-ldflags.patch
index f88a1473d..c2c662402 100644
--- a/dev-libs/libwiimote/files/libwiimote-9999-ldflags.patch
+++ b/dev-libs/libwiimote/files/libwiimote-9999-ldflags.patch
@@ -1,18 +1,7 @@
-Index: test/Makefile.am
-===================================================================
---- test/Makefile.am	(Revision 80)
-+++ test/Makefile.am	(Arbeitskopie)
-@@ -1,4 +1,3 @@
- AM_CFLAGS = -I../src -D_ENABLE_TILT -lm
- LDADD = ../src/libcwiimote.la
- noinst_PROGRAMS= test1 test2 test3 test4
--
-Index: configure.ac
-===================================================================
---- configure.ac	(Revision 80)
-+++ configure.ac	(Arbeitskopie)
-@@ -5,22 +5,26 @@
- AC_INIT([libwiimote], [0.4.0], [http://sourceforge.net/projects/libwiimote/])
+--- configure.ac	2009-09-07 19:20:06.000000000 +0200
++++ configure.ac.new	2009-09-07 19:24:40.000000000 +0200
+@@ -5,23 +5,26 @@
+ AC_INIT([libwiimote], [0.5.0], [http://sourceforge.net/projects/libwiimote/])
  AC_CONFIG_HEADER([config.h])
  
 -
@@ -31,22 +20,23 @@ Index: configure.ac
 +AC_PROG_MAKE_SET
  AC_SUBST(LIBTOOL_DEPS)
  AM_PROG_LIBTOOL
- 
+ AC_CONFIG_MACRO_DIR([m4])
  # Checks for libraries.
- AC_CHECK_LIB([bluetooth], [hci_remote_name],
+ AC_CHECK_LIB([bluetooth], [hci_read_remote_name],
 -             [], [AC_MSG_ERROR([We require BlueZ])])
+-
 +             [], [AC_MSG_ERROR([BlueZ library required, available at http://www.bluez.org/])])
 +AC_CHECK_LIB([m], [asin],
 +             [], [AC_MSG_ERROR([libm required])])
- 
  # Checks for header files.
  AC_HEADER_STDC
-@@ -45,7 +49,7 @@
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h])
+@@ -45,7 +48,7 @@
  AC_CONFIG_FILES([Makefile
                   src/Makefile
                   test/Makefile
 -		 libwiimote.pc])
-+                 libwiimote.pc])
++					  libwiimote.pc])
  AC_OUTPUT
  echo
  echo $PACKAGE v$VERSION
diff --git a/dev-libs/libwiimote/files/libwiimote-hci.patch b/dev-libs/libwiimote/files/libwiimote-hci.patch
new file mode 100644
index 000000000..5ef54005b
--- /dev/null
+++ b/dev-libs/libwiimote/files/libwiimote-hci.patch
@@ -0,0 +1,12 @@
+hci_remote_name is deprecated in BlueZ >2
+--- configure.in	2009-09-07 20:09:50.181034970 +0200
++++ configure.in.new	2009-09-07 20:11:00.872007806 +0200
+@@ -10,7 +10,7 @@
+ AC_PROG_INSTALL
+ 
+ # Checks for BlueZ.
+-AC_CHECK_LIB([bluetooth], [hci_remote_name],
++AC_CHECK_LIB([bluetooth], [hci_read_remote_name],
+ 	     [], [AC_MSG_ERROR([We require BlueZ])])
+ 
+ AC_CONFIG_FILES([config.mk
diff --git a/dev-libs/libwiimote/libwiimote-0.4.ebuild b/dev-libs/libwiimote/libwiimote-0.4.ebuild
index e7daf249e..951380dcb 100644
--- a/dev-libs/libwiimote/libwiimote-0.4.ebuild
+++ b/dev-libs/libwiimote/libwiimote-0.4.ebuild
@@ -15,12 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples force tilt"
 
-RDEPEND="net-wireless/bluez-libs
-	net-wireless/bluez-utils"
+RDEPEND="
+	|| ( net-wireless/bluez
+		( >=net-wireless/bluez-libs-3
+		net-wireless/bluez-utils ) )"
 DEPEND=${RDEPEND}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{amd64,as-needed,include}.patch
+	epatch "${FILESDIR}"/${PN}-{amd64,as-needed,include,hci}.patch
 	use "tilt" || sed -i -e "s:-D_ENABLE_TILT::" config.mk.in
 	use "force" || sed -i -e "s:-D_ENABLE_FORCE::" config.mk.in
 	eautoreconf
diff --git a/dev-libs/libwiimote/libwiimote-9999.ebuild b/dev-libs/libwiimote/libwiimote-9999.ebuild
index ae82c531c..fe3a85bb5 100644
--- a/dev-libs/libwiimote/libwiimote-9999.ebuild
+++ b/dev-libs/libwiimote/libwiimote-9999.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="http://libwiimote.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples force tilt"
+IUSE="examples"
 
-RDEPEND="net-wireless/bluez-libs"
+RDEPEND="|| ( net-wireless/bluez-libs net-wireless/bluez )"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
@@ -25,14 +25,6 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	econf \
-		$(use_enable force) \
-		$(use_enable tilt)
-
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README TODO || die "dodoc failed"