dev-libs/libwiimote: Update ebuilds with suggestions from Tommy[D]

svn path=/sunrise/; revision=5670

4 files changed, 22 insertions, 18 deletions

diff --git a/dev-libs/libwiimote/ChangeLog b/dev-libs/libwiimote/ChangeLog
index 60c7d0a73..66c96f8d5 100644
--- a/dev-libs/libwiimote/ChangeLog
+++ b/dev-libs/libwiimote/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Feb 2008; Christoph Brill (egore) egore@gmx.de libwiimote-0.4.ebuild,
+  libwiimote-9999.ebuild:
+  Update ebuilds with suggestions from Tommy[D]
+
   16 Feb 2008; Christoph Brill (egore) egore@gmx.de
   +files/libwiimote-9999-ldflags.patch, libwiimote-9999.ebuild:
   Add patch to build with --as-needed LDFLAGS
diff --git a/dev-libs/libwiimote/Manifest b/dev-libs/libwiimote/Manifest
index 6a5db3533..4591caf63 100644
--- a/dev-libs/libwiimote/Manifest
+++ b/dev-libs/libwiimote/Manifest
@@ -2,7 +2,7 @@ AUX libwiimote-9999-ldflags.patch 1375 RMD160 f86c512876f8a492e8a1d1b639b139164e
 AUX libwiimote-amd64.patch 397 RMD160 b51df3594b6f2c2e1d3772abb1cf663db1d5243d SHA1 f34d5ffdb87d78118399af5e3cb2f91772fe962e SHA256 bb100931e55920017247e4835e153b8c370a8490a8a451e56af6669aa14b4a02
 AUX libwiimote-as-needed.patch 496 RMD160 24d5c589b6c15cfcc0701279c7af67f9921c0b3f SHA1 c45b90c9831b5f94f0726d37f47f3f23578c88df SHA256 550e482c40662970777eada373c79cecc169916af6dd3a42d22a2f84f5e92a44
 DIST libwiimote-0.4.tgz 30857 RMD160 4fefc82cd577404a9aefda2d40144cb2c6d9c6c8 SHA1 79b1639d481b35eb6df7b83877f9438944ec389c SHA256 a1e9d45a0d4dd367f1371dd477e30ecaa95e59b9fb8635dc9e7f26e4eb231d90
-EBUILD libwiimote-0.4.ebuild 866 RMD160 3bc240d785299eeac0ee3ee04a371ca356f494bf SHA1 694a6efa6fe6b19b252e93d9cc6cb3f9cf151c28 SHA256 139f6d1f7ec23dc3388b8cba4adf0625a2b0ca7b3eada0d9e8163ceae5759fe3
-EBUILD libwiimote-9999.ebuild 1197 RMD160 d1405ce4df2dd757031ae598823b8314342186e0 SHA1 be5224348c97e10501b48760e6e47a9619a0bc44 SHA256 6c2d86ce36834155496f2baad4d3eed94b1ea1a2851287ff6ffa3aedd137953d
-MISC ChangeLog 676 RMD160 035e6fa4e9242f4a23a18a2302869e9412f0e0a9 SHA1 16f9678909a70f62383a28d36e41f14007b37e11 SHA256 da8c8a7f9447a4aa2a53e3ca3d1b055f2d9cb7a0f8529f790247aea40c73ab94
+EBUILD libwiimote-0.4.ebuild 926 RMD160 920f9c95fd9bbbee9716d1c1271af644ce745b36 SHA1 6677fa8777027aa3ca0804e747315999285afddb SHA256 7feab43a0a20be067893e2c91704c9c9e1691f97a00e84e1d8a51d81d3b0d06a
+EBUILD libwiimote-9999.ebuild 964 RMD160 b9e7a65586d1b48de8e6fd37bdf946da322b058a SHA1 5d21efb9727205bb23823eb3fef103db487810b4 SHA256 62b0bdc8bf5aae899dee87a728e5fac7696a77821efb122d405fc77baa797ac3
+MISC ChangeLog 826 RMD160 f7f87cbf61bf8d61034fe1a826543f89bb6fd922 SHA1 6ea89667a5e66e75870c781fcae910727b6dee1f SHA256 4cf3fcf5a77e0c7e7f1934188e2ab7ff2807db7e6dc6c4bc0dc48b68ac80c506
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-libs/libwiimote/libwiimote-0.4.ebuild b/dev-libs/libwiimote/libwiimote-0.4.ebuild
index 3fe365dfc..c9284f2f0 100644
--- a/dev-libs/libwiimote/libwiimote-0.4.ebuild
+++ b/dev-libs/libwiimote/libwiimote-0.4.ebuild
@@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tilt force"
+IUSE="examples tilt force"
 
-DEPEND="net-wireless/bluez-libs
+RDEPEND="net-wireless/bluez-libs
 		net-wireless/bluez-utils"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
 src_unpack() {
@@ -31,6 +31,10 @@ src_unpack() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README TODO
+
+	if use examples; then
+		dodoc test/test?.c
+	fi
 }
diff --git a/dev-libs/libwiimote/libwiimote-9999.ebuild b/dev-libs/libwiimote/libwiimote-9999.ebuild
index d18593b3c..37d4a2247 100644
--- a/dev-libs/libwiimote/libwiimote-9999.ebuild
+++ b/dev-libs/libwiimote/libwiimote-9999.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils subversion autotools flag-o-matic
+inherit eutils subversion autotools
 
 ESVN_REPO_URI="https://libwiimote.svn.sourceforge.net/svnroot/libwiimote/branches/ant"
 ESVN_PROJECT="libwiimote"
-#ESVN_BOOTSTRAP="eautoreconf"
 
 DESCRIPTION="Library to connect to the Nintendo Wii remote (svn snapshot)"
 HOMEPAGE="http://libwiimote.sourceforge.net"
@@ -17,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples tilt force"
 
 RDEPEND="net-wireless/bluez-libs"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
 
 src_unpack() {
 	subversion_src_unpack
@@ -27,22 +27,18 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_enable force force) \
-		$(use_enable tilt tilt) \
+		$(use_enable force) \
+		$(use_enable tilt) \
 		|| die "Error: econf failed!"
 
 	emake || die "emake failed"
 }
 
-
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README TODO
 
 	if use examples; then
-		elog "Installing test programs with sources in /usr/share/doc/${PF}/${DOCDESTTREE}"
-		dodir /usr/share/doc/${PF}/${DOCDESTTREE}
-		cp "${S}/test/test? ${D}usr/share/doc/${PF}/${DOCDESTTREE}"
-		dodoc "${S}/test/test?.c"
+		dodoc test/test?.c
 	fi
 }