Version bump and remove old.

Package-Manager: portage-2.1.9.23/cvs/Linux x86_64

6 files changed, 37 insertions, 363 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index e27a9ed069d1..e39c76067715 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.55 2010/10/07 20:52:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.56 2010/10/31 11:23:38 pacho Exp $
+
+*bluez-4.77 (31 Oct 2010)
+
+  31 Oct 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.66-r1.ebuild,
+  -bluez-4.71.ebuild, -bluez-4.72.ebuild, +bluez-4.77.ebuild:
+  Remove old and version bump:
+	Fix issue with device name and accessing already freed memory.
+	Fix issue with handling CHLD=0 command for handsfree.
+	Fix issue with manager properties and no adapters.
+	Fix issue with properties and broken service records.
+	Fix issue with A2DP playback and sample rate changes.
+	Update MCAP and HDP support.
+	Fix issue in telephony driver with hanging up held call.
+	Fix issue in telephony driver with notifications when on hold.
+	Fix issue with blocking on setconf confirmation callback.
+	Fix issue with not always signaling new streams as sinks.
+	Fix issue with errors in case of endpoint request timeout.
+	Fix issue with HFP/HSP microphone and speaker gain values.
+	Add source if the device attempt to configure local sink stream.
+	Add PSM option for GATT/ATT over BR/EDR on gatttool.
+	Add support for GATT/ATT Attribute Write Request.
+	Update MCAP and HDP support.
 
 *bluez-4.75 (07 Oct 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a0f5989ab493..c88f59126791 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -21,24 +21,20 @@ AUX conf.d-dund 96 RMD160 cf0a59a45f6f1bab134e4aab3545a94dfe094ae0 SHA1 c8d3196d
 AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ecdf6d973c09553ed525e97e1cad2d6261f SHA256 e4985a2295d1cd2361b4a6a01b2d474820bf66cb1ff9251742d7aacd0fa574aa
 AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
-DIST bluez-4.66.tar.gz 990368 RMD160 9b69117652f42e1619ee18dde6801b1297e4803a SHA1 557eed51d542d95f9d5b3d7d58142c045ea4c3b1 SHA256 c223cbb80df0b1f17f6ef4efd0be1fe35ae640bd979f852cfbcc452abc0a7ea5
 DIST bluez-4.69.tar.gz 997733 RMD160 03be499fdb5064e0ec1440eddbcc452f5448566a SHA1 488a70627dd40d8a138477d5363ff1444bce77bd SHA256 10e67a9349bbd7aecc177631c2703e9bd346dffe10a4b70b058c3a1da8b98ec0
-DIST bluez-4.71.tar.gz 1047409 RMD160 d089165676c7b2f24d99e5d6680cd51b22f22eca SHA1 60a1bf0b9691ca017a42e57e2b0e898b39eba182 SHA256 ef9356c1097cc296747e7e82fa602279100667567bf9277f5f02668744eb0d46
-DIST bluez-4.72.tar.gz 1075806 RMD160 030f46247289c22edf0e11fd928c437e67283e16 SHA1 ba33bbf8ec49f30e0f510952cebf5e5620396d55 SHA256 2e00a5cfa0db9e8ff9ff33298307518bdbff883b1f558d18b4f27d26c515288a
 DIST bluez-4.75.tar.gz 1081608 RMD160 ff1efd6f179fcf506a48f0c3bfef5a1174a9c0ca SHA1 da50e5f5fef2d3f622589395313ed28827d6666b SHA256 fd861de5c966dc563e6a1c34400bb0c0fe1277e37655ab3ce3f48356035f61b8
+DIST bluez-4.77.tar.gz 1092738 RMD160 61074ed32f1003c7af91a0295ff5e89045e6652f SHA1 adad98dcf933f6f358f820f3ef3ffdf805a9f090 SHA256 9d77a0d9cd6b207304ae5446926a57ad492002602cfd64e622898bd878f248f3
 DIST oui.txt 2242423 RMD160 3bc6dddb90f1d66403318b38b808b112ff677e32 SHA1 bdccd06d48a9e6b5510f1011c0ec0114e008deda SHA256 3dd21812fb79a965c0dac89a66f7f1362f0d0eabe6e131f1cecc46bf6fe6fa1e
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
-EBUILD bluez-4.66-r1.ebuild 4793 RMD160 83ff860b7081e3863bafae762257249076d21325 SHA1 8c8e26b1e853a824d01be2b4a6c8cc636058fd41 SHA256 537bcfe966e347a8aec8cdba8b3381dc016aa48036285ef3fd9f8ec3dfbd9008
 EBUILD bluez-4.69.ebuild 4873 RMD160 75b097d0c6027cc5e9f780f6a6e5a5780d72be98 SHA1 327fe532709a3accd14a35453988a3acd76e449a SHA256 e645f7ec152a080dd7f1f9c162a7a2a6337cf88a55926f48e404c0e7e2991bc0
-EBUILD bluez-4.71.ebuild 5049 RMD160 cc8eaa3a5a667ea9706839c583482b6d78182270 SHA1 f3b75eaf546d17a37d0754394546db455bc61b17 SHA256 c463b2fc09ce99dff62775766fd2e2b24f8f3a5599344215fad6fbfd2381e3de
-EBUILD bluez-4.72.ebuild 5197 RMD160 ee0c7b3424c5802785427011f5ef7b47b21c272f SHA1 9add5dd43bbec7c7e494240bdfcc13e27f176d14 SHA256 a9d0665fbee9ae37f909b253f2e32231b402110b512e02ca694b86860daccf5b
 EBUILD bluez-4.75.ebuild 5197 RMD160 60a28c534ca0ec85241b37d5824e523cac6625b1 SHA1 ac4bc402658d172f7ce59dafd2c9ff8cb5f30f3b SHA256 385d80c2592d999f3f5532dedba819697e38c121175df8c52acaaf6583c6f90e
-MISC ChangeLog 10732 RMD160 6ebf529b0f0b5f92a75211d9dae0e1b03b3cf132 SHA1 c7082ddef8cf984cdb71d86e0e6bfc5f32720c61 SHA256 9868abf223fba5544a7729b0bf229a557c1aef990c5f0ff4e6e18fb220d52ff6
-MISC metadata.xml 1117 RMD160 62bc1c1c7b5c778cbbed7cd34668337032ccd483 SHA1 795ce81485214c9224418706927a953f52da5a89 SHA256 23c4de4f42645a947bf8d4d5c8cc77b1d4afda03c2ab77d82ed746e71469586c
+EBUILD bluez-4.77.ebuild 5205 RMD160 d432c99ea0205a7a0cd8ec6151e1dee28cc6084e SHA1 cd60406cb92d724d9c9ca72c2992589c5d364e91 SHA256 b5550972c9dfdbcc94424ce3aae97969e6a09fd9a4a2d48c1330326ced36c5a5
+MISC ChangeLog 11794 RMD160 ddf3faa6fa8db03b47c8751b8ae55c18553056aa SHA1 43840cea08d2382444f95adf4017f0a5c420ab1f SHA256 b72926b6d8867d624dfca8b56818432edd101ddd7cd0a22396d8b060ef672683
+MISC metadata.xml 1052 RMD160 5df0b0075716e5e6aee6ebcb4b734c61ca4e372e SHA1 9b13c6123b253d99e742c8a1e9be5ed50b430c80 SHA256 7006466957d5bb3c892604d1e76093d1ee2ba9fc85ebe6459f643138af174c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyuMxEACgkQCaWpQKGI+9RrgQCghovxXcGmXUoWpoazvhWF6Q1Q
-VC8An1O0Q4F3RtaS+AWRV7HNs9dqqUke
-=VEP4
+iEYEARECAAYFAkzNUcAACgkQCaWpQKGI+9TrMwCcD0uz3Yj+2RqKi3sWB0nntDQO
+GkUAnjPW5DjvGD7PgLxTkBtqnBVk/r4Y
+=gdZu
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.66-r1.ebuild b/net-wireless/bluez/bluez-4.66-r1.ebuild
deleted file mode 100644
index 76cedf6909b8..000000000000
--- a/net-wireless/bluez/bluez-4.66-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.66-r1.ebuild,v 1.4 2010/09/07 15:06:33 jer Exp $
-
-EAPI="2"
-
-inherit autotools multilib eutils
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-
-IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb"
-
-CDEPEND="alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
-	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	usb? ( dev-libs/libusb )
-	cups? ( net-print/cups )
-	>=sys-fs/udev-146[extras]
-	>=dev-libs/glib-2.14
-	sys-apps/dbus
-	media-libs/libsndfile
-	>=dev-libs/libnl-1.1
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils"
-DEPEND="sys-devel/flex
-	>=dev-util/pkgconfig-0.20
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	consolekit? ( sys-auth/pambase[consolekit] )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject )"
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-}
-
-src_prepare() {
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
-
-	if use cups; then
-		epatch "${FILESDIR}/4.60/cups-location.patch"
-	fi
-
-	# Fix alsa files location
-	epatch "${FILESDIR}/${PN}-alsa_location.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable caps capng) \
-		--enable-network \
-		--enable-serial \
-		--enable-input \
-		--enable-audio \
-		--enable-service \
-		$(use_enable gstreamer) \
-		$(use_enable alsa) \
-		$(use_enable usb) \
-		--enable-netlink \
-		--enable-tools \
-		--enable-bccmd \
-		--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-udevrules \
-		--enable-configfiles \
-		$(use_enable pcmcia) \
-		$(use_enable debug) \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README || die
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
-		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf \
-		|| die
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
-	exeinto /$(get_libdir)/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
-
-	newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die
-	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
-
-	elog
-	elog "To use dial up networking you must install net-dialup/ppp."
-	elog
-	elog "For a password agent, there is for example net-wireless/bluez-gnome"
-	elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a"
-	elog "try to net-wireless/blueman"
-	elog
-	elog "Use the old-daemons use flag to get the old daemons like hidd"
-	elog "installed. Please note that the init script doesn't stop the old"
-	elog "daemons after you update it so it's recommended to run:"
-	elog "  /etc/init.d/bluetooth stop"
-	elog "before updating your configuration files or you can manually kill"
-	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
-
-	if use consolekit; then
-		elog ""
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog ""
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package."
-	fi
-
-	if use old-daemons; then
-		elog ""
-		elog "The hidd init script was installed because you have the old-daemons"
-		elog "use flag on. It is not started by default via udev so please add it"
-		elog "to the required runlevels using rc-update <runlevel> add hidd. If"
-		elog "you need init scripts for the other daemons, please file requests"
-		elog "to https://bugs.gentoo.org."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.71.ebuild b/net-wireless/bluez/bluez-4.71.ebuild
deleted file mode 100644
index 20f56839a7d2..000000000000
--- a/net-wireless/bluez/bluez-4.71.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.71.ebuild,v 1.1 2010/09/10 10:07:56 pacho Exp $
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	http://standards.ieee.org/regauth/oui/oui.txt"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 mcap old-daemons pcmcia pnat test-programs usb"
-
-CDEPEND="alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
-	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	usb? ( dev-libs/libusb )
-	cups? ( net-print/cups )
-	>=sys-fs/udev-146[extras]
-	>=dev-libs/glib-2.14
-	sys-apps/dbus
-	media-libs/libsndfile
-	>=dev-libs/libnl-1.1
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils"
-DEPEND="sys-devel/flex
-	>=dev-util/pkgconfig-0.20
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	consolekit? ( sys-auth/pambase[consolekit] )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject )"
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-}
-
-src_prepare() {
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
-
-	if use cups; then
-		epatch "${FILESDIR}/4.60/cups-location.patch"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable caps capng) \
-		--enable-network \
-		--enable-serial \
-		--enable-input \
-		--enable-audio \
-		--enable-service \
-		$(use_enable gstreamer) \
-		$(use_enable alsa) \
-		$(use_enable usb) \
-		--enable-netlink \
-		--enable-tools \
-		--enable-bccmd \
-		--enable-dfutool \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
-		$(use_enable old-daemons dund) \
-		$(use_enable attrib) \
-		$(use_enable mcap) \
-		$(use_enable pnat) \
-		$(use_enable maemo6) \
-		$(use_enable cups) \
-		$(use_enable test-programs test) \
-		--enable-udevrules \
-		--enable-configfiles \
-		$(use_enable pcmcia) \
-		$(use_enable debug) \
-		--localstatedir=/var \
-		--disable-hal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README || die
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
-		newinitd "${FILESDIR}/init.d-hidd" hidd || die
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf \
-		|| die
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
-	exeinto /$(get_libdir)/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
-
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth || die
-	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	doins "${DISTDIR}/oui.txt" || die
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
-
-	elog
-	elog "To use dial up networking you must install net-dialup/ppp."
-	elog
-	elog "For a password agent, there is for example net-wireless/bluez-gnome"
-	elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a"
-	elog "try to net-wireless/blueman"
-	elog
-	elog "Use the old-daemons use flag to get the old daemons like hidd"
-	elog "installed. Please note that the init script doesn't stop the old"
-	elog "daemons after you update it so it's recommended to run:"
-	elog "  /etc/init.d/bluetooth stop"
-	elog "before updating your configuration files or you can manually kill"
-	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
-
-	if use consolekit; then
-		elog ""
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog ""
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if use old-daemons; then
-		elog ""
-		elog "The hidd init script was installed because you have the old-daemons"
-		elog "use flag on. It is not started by default via udev so please add it"
-		elog "to the required runlevels using rc-update <runlevel> add hidd. If"
-		elog "you need init scripts for the other daemons, please file requests"
-		elog "to https://bugs.gentoo.org."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.72.ebuild b/net-wireless/bluez/bluez-4.77.ebuild
index 87bbe3faaf69..5172ae1aa9a9 100644
--- a/net-wireless/bluez/bluez-4.72.ebuild
+++ b/net-wireless/bluez/bluez-4.77.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.72.ebuild,v 1.1 2010/09/24 21:32:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.77.ebuild,v 1.1 2010/10/31 11:23:38 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit multilib eutils
 
@@ -69,7 +69,6 @@ src_configure() {
 		$(use_enable gstreamer) \
 		$(use_enable alsa) \
 		$(use_enable usb) \
-		--enable-netlink \
 		--enable-tools \
 		--enable-bccmd \
 		--enable-dfutool \
@@ -91,19 +90,19 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${ED}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README || die
 
 	if use test-programs ; then
 		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
+		dobin simple-agent simple-service monitor-bluetooth || die
+		newbin list-devices list-bluetooth-devices || die
 		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
+			newbin "${b}" "bluez-${b}" || die
 		done
 		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
+		doins service-* || die
 
 		cd "${S}"
 	fi
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 566e5018cf3c..a28f245d1092 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name='consolekit'>Use <pkg>sys-auth/pambase[consolekit]</pkg> to
 			determine access to bluetooth devices based on whether a user is
 			logged in locally or remotely</flag>
-		<flag name='mcap'>Compile with initial support for MCAP</flag>
 		<flag name='health'>Compile with initial support for HDP</flag>
 		<flag name='maemo6'>Compile with maemo6 plugin</flag>
 		<flag name='old-daemons'>Install old daemons like hidd and sdpd that are