Reworked the parameter list for configure (bug #234516), 'dobin' test-binaries conditionally (bug #162715).

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 27 insertions, 31 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 37d1f65c609b..b6757cbf4c8a 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.128 2008/08/11 13:42:15 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.129 2008/08/12 14:09:37 dev-zero Exp $
+
+  12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org>
+  bluez-utils-3.36.ebuild:
+  Reworked the parameter list for configure (bug #234516), 'dobin'
+  test-binaries conditionally (bug #162715).
 
   11 Aug 2008; Tiziano Müller <dev-zero@gentoo.org>
   bluez-utils-3.36.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index bf6ab543e374..1ccc008784ef 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -30,6 +30,6 @@ EBUILD bluez-utils-3.28-r1.ebuild 4917 RMD160 de7965d02ed2fb2db85d40e135f03c6397
 EBUILD bluez-utils-3.28.ebuild 4875 RMD160 ea8d3ff25bf04b299285f5f7f54b92835ad34ce1 SHA1 c397ce45a66c621df946f6c7cf81dd214348d290 SHA256 dd87ac65852e7ec4f693448c11255cdbf43f49b9a7e2e20cc76e8952dbfd34c0
 EBUILD bluez-utils-3.30.ebuild 4793 RMD160 fa7d5cdc222132320a20106cbbeb974a8a33a689 SHA1 d3b13b1d7856f4bb89c33788deda1fa749b4fc51 SHA256 8d1a10c3317949fd887a960d8f36af0d624ea8c7988b82e38e981463d4971aa9
 EBUILD bluez-utils-3.32.ebuild 4823 RMD160 9474155d8f5691b20238981688df297b5877bbc6 SHA1 862ef0d571cb83c6e0d7e1ea0f718fbb82d85597 SHA256 aa457404696e23ddd9e937523472c3f4c4804ec6ba30882d14de02f93679b2fe
-EBUILD bluez-utils-3.36.ebuild 4893 RMD160 94ec398cf1bd794ff8c5df67ea563106c8dda2ac SHA1 d04fe79c8b6e2206a147ef1a35a705a293c8d933 SHA256 590892cb5b88a46dfc4d0ed99d8d54f805e348c565e01a742813bfeabbbe8b30
-MISC ChangeLog 21591 RMD160 3db136d7ed22155a092804b60719fb3614bf86c4 SHA1 7714c3efb9254357f89e9adeb316d4177898c808 SHA256 1b270dcf2008b7d2c69a35d5fd3b8285eec52df4fc58a8b45ba2744edded46bb
+EBUILD bluez-utils-3.36.ebuild 4661 RMD160 a54e5d84b12411b581ee8f4ded7b41c631fa69ae SHA1 a42f5f8bc74a76d63fdbde03742af12657dac019 SHA256 a08ec7ff44fca8885b7b53b164055004fb8a0959e63916a305cfb644f312f4c5
+MISC ChangeLog 21784 RMD160 88382016b81dde633021aeab4f4b6f2ed70374f9 SHA1 8f0d96c3620461a8f416aea37e197b65b9b40af8 SHA256 df989b162e7110fea19bfb54239f4b25ebdeb9b7a29b9333d77b8d0c0cc643a1
 MISC metadata.xml 246 RMD160 2be63471293bc7dcf5b4efa7217bf0ec94d2a34e SHA1 cb0eefc516c70671b22b6bf8005ac94ff125f476 SHA256 75b18c15a1d7257d81551ae42b51a4f0585eee47eb1d98ca83661e2471bc2df4
diff --git a/net-wireless/bluez-utils/bluez-utils-3.36.ebuild b/net-wireless/bluez-utils/bluez-utils-3.36.ebuild
index 4fd9bf4ae15e..23f05f145776 100644
--- a/net-wireless/bluez-utils/bluez-utils-3.36.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-3.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.36.ebuild,v 1.2 2008/08/11 13:42:15 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.36.ebuild,v 1.3 2008/08/12 14:09:37 dev-zero Exp $
 
 inherit autotools multilib eutils
 
@@ -47,41 +47,32 @@ src_compile() {
 
 	# we don't need the other daemons either with the new
 	# service architechture
-	# hcid has in integrated sdpd now that we use
-
-	# These are currently under work and don't work properly:
-	# --enable-sync
-	# --enable-obex
 
 	econf \
-		$(use_enable debug) \
-		--enable-inotify \
-		$(use_enable usb) \
-		$(use_enable alsa) \
-		--enable-glib  \
-		$(use_enable gstreamer) \
-		--disable-obex \
+		--enable-glib \
 		--enable-network \
 		--enable-serial \
 		--enable-input \
 		--enable-audio \
-		--disable-sync \
-		$(use_enable examples echo) \
-		--enable-hcid \
-		$(use_enable test-programs test) \
-		$(use_enable old-daemons sdpd) \
+		$(use_enable gstreamer) \
+		$(use_enable alsa) \
+		$(use_enable usb) \
+		--enable-netlink \
+		--enable-tools \
+		--enable-bccmd \
+		--enable-hid2hci \
+		--enable-dfutool \
 		$(use_enable old-daemons hidd) \
 		$(use_enable old-daemons pand) \
+		$(use_enable old-daemons dund) \
 		$(use_enable cups) \
+		$(use_enable test-programs test) \
+		--enable-manpages \
 		--enable-configfiles \
 		--disable-initscripts \
 		--disable-pcmciarules \
-		--enable-bccmd \
-		--enable-avctrl \
-		--enable-hid2hci \
-		--enable-dfutool \
-		--localstatedir=/var \
-		|| die "econf failed"
+		$(use_enable debug) \
+		--localstatedir=/var
 
 	emake || die "emake failed"
 }
@@ -91,12 +82,12 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog README || die
 
-	# a very simple example daemon
-	dobin test/passkey-agent || die
-	dobin test/auth-agent || die
-
 	if use test-programs ; then
 		dobin input/test-input || die
+
+		# a very simple example daemon
+		dobin test/passkey-agent || die
+		dobin test/auth-agent || die
 	fi
 
 	newinitd "${FILESDIR}/3.11/bluetooth-init.d" bluetooth || die