Version bump, remove old, bump to eapi4, don't install .c and .o files (bug #356529 by Alec M.), init script needs hostname (bug #356739 by Johan Myreen), libnl dep is no longer needed (bug #359105 by Yaroslav Isakov).

(Portage version: 2.1.9.43/cvs/Linux x86_64)

10 files changed, 213 insertions, 294 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 88e6d9d20acb..bdb33ca6d4bf 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.79 2011/03/12 13:14:51 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.80 2011/03/20 16:57:35 pacho Exp $
+
+*bluez-4.90 (20 Mar 2011)
+
+  20 Mar 2011; Pacho Ramos <pacho@gentoo.org> +files/bluetooth-conf.d,
+  +files/conf.d-hidd, -files/4.31-as_needed.patch, -bluez-4.39-r2.ebuild,
+  -files/4.34-conditional_libsbc.patch,
+  -files/bluez-4.62-makefile_ipctest.patch, +bluez-4.90.ebuild,
+  -files/bluez-alsa_location.patch, files/bluetooth-init.d:
+  Version bump, remove old, bump to eapi4, don't install .c and .o files (bug
+  #356529 by Alec M.), init script needs hostname (bug #356739 by Johan
+  Myreen), libnl dep is no longer needed (bug #359105 by Yaroslav Isakov).
 
   12 Mar 2011; Thomas Kahle <tomka@gentoo.org> bluez-4.87.ebuild:
   x86 stable per bug 356255
diff --git a/net-wireless/bluez/bluez-4.39-r2.ebuild b/net-wireless/bluez/bluez-4.39-r2.ebuild
deleted file mode 100644
index 7af371f6fb73..000000000000
--- a/net-wireless/bluez/bluez-4.39-r2.ebuild
+++ /dev/null
@@ -1,175 +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.39-r2.ebuild,v 1.9 2010/02/01 20:18:32 pacho 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 +consolekit cups debug doc gstreamer old-daemons test-programs usb"
-
-CDEPEND="alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
-	)
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	usb? ( dev-libs/libusb )
-	cups? ( net-print/cups )
-	sys-fs/udev
-	dev-libs/glib
-	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
-	doc? ( dev-util/gtk-doc )
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	consolekit? ( sys-auth/pambase[consolekit] )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/4.31-as_needed.patch" \
-		"${FILESDIR}/4.34-conditional_libsbc.patch"
-
-	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.18/cups-location.patch"
-	fi
-
-	# needed for both patches
-	eautoreconf
-}
-
-src_configure() {
-	# the order is the same as ./configure --help
-
-	# we don't need the other daemons either with the new
-	# service architechture
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		--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-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 \
-		$(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
-
-	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
-	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
-		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
-	fi
-
-	# bug #84431
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
-	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
-
-	exeinto /$(get_libdir)/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
-	doexe  "${S}/scripts/bluetooth_serial" || die
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf
-}
-
-pkg_postinst() {
-	udevadm control --reload_rules && udevadm trigger
-
-	elog
-	elog "To use dial up networking you must install net-dialup/ppp."
-	elog ""
-	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
-	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
-	elog "For a password agent, there are for example net-wireless/bluez-gnome"
-	elog "and net-wireless/gnome-bluetooth:2 for GNOME. For KDE, see bug 246381"
-	elog ""
-	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
-	elog "on the new service architechture:"
-	elog "	http://wiki.bluez.org/wiki/Services"
-	elog ""
-	elog "3.15 adds support for the audio service. See"
-	elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help."
-	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."
-	elog ""
-	elog "If you want to use rfcomm as a normal user, you need to add the user"
-	elog "to the uucp group."
-	elog ""
-	if use old-daemons; then
-		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 runleves 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."
-	else
-		elog "The bluetooth service should be started automatically by udev"
-		elog "when the required hardware is inserted next time."
-	fi
-	elog
-	ewarn "On first install you need to run /etc/init.d/dbus reload or hcid"
-	ewarn "will fail to start."
-}
diff --git a/net-wireless/bluez/bluez-4.90.ebuild b/net-wireless/bluez/bluez-4.90.ebuild
new file mode 100644
index 000000000000..2824a66a0061
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.90.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.90.ebuild,v 1.1 2011/03/20 16:57:35 pacho Exp $
+
+EAPI="4"
+
+inherit multilib eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org/"
+
+# Because of oui.txt changing from time to time without noticement, we need to supply it
+# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
+# See bugs #345263 and #349473 for reference.
+OUIDATE="20110320" # Needed because of bug #345263
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.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 health 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:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10 )
+	usb? ( dev-libs/libusb:1 )
+	cups? ( net-print/cups )
+	>=sys-fs/udev-146[extras]
+	>=dev-libs/glib-2.14:2
+	sys-apps/dbus
+	media-libs/libsndfile
+	!net-wireless/bluez-libs
+	!net-wireless/bluez-utils"
+DEPEND="sys-devel/flex
+	>=dev-util/pkgconfig-0.20
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	consolekit? ( sys-auth/consolekit )
+	test-programs? (
+		dev-python/dbus-python
+		dev-python/pygobject:2 )"
+
+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
+		sed -i -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
+			Makefile.tools Makefile.in || die
+	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-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 health) \
+		$(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
+	dodoc AUTHORS ChangeLog README
+
+	if use test-programs ; then
+		cd "${S}/test"
+		dobin simple-agent simple-service monitor-bluetooth
+		newbin list-devices list-bluetooth-devices
+		rm test-textfile.{c,o} || die # bug #356529
+		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}/conf.d-hidd" hidd
+		newinitd "${FILESDIR}/init.d-hidd" hidd
+		newconfd "${FILESDIR}/conf.d-dund" dund
+		newinitd "${FILESDIR}/init.d-dund" dund
+	fi
+
+	insinto /etc/bluetooth
+	doins \
+		input/input.conf \
+		audio/audio.conf \
+		network/network.conf \
+		serial/serial.conf
+
+	insinto /$(get_libdir)/udev/rules.d/
+	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
+	exeinto /$(get_libdir)/udev/
+	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
+
+	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
+	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
+
+	# Install oui.txt as requested in bug #283791 and approved by upstream
+	insinto /var/lib/misc
+	newins "${DISTDIR}/oui-${OUIDATE}.txt" oui.txt
+
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
+
+	if ! has_version "net-dialup/ppp"; then
+		elog
+		elog "To use dial up networking you must install net-dialup/ppp."
+	fi
+
+	if ! has_version "net-wireless/gnome-bluetooth" && ! has_version "net-wireless/kbluetooth"; then
+		elog
+		elog "For desktop integration you can try net-wireless/gnome-bluetooth"
+		elog "for gnome and net-wireless/kbluetooth for kde."
+	fi
+
+	if ! use old-daemons; then
+		elog
+		elog "Use the old-daemons use flag to get the old daemons like hidd or pand"
+		elog "installed. Please note that 'bluetooth' init script doesn't stop the old"
+		elog "daemons after you update it, so it's recommended to stop all of them using"
+		elog "their own init scripts or manually killing them."
+	fi
+
+	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 "dund and hidd init scripts were installed because you have the old-daemons"
+		elog "use flag on. They are not started by default via udev so please add them"
+		elog "to the required runlevels using rc-update <runlevel> add <dund/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/files/4.31-as_needed.patch b/net-wireless/bluez/files/4.31-as_needed.patch
deleted file mode 100644
index 99b8ce4c2321..000000000000
--- a/net-wireless/bluez/files/4.31-as_needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur bluez-4.31.orig/common/Makefile.am bluez-4.31/common/Makefile.am
---- bluez-4.31.orig/common/Makefile.am	2009-02-27 22:57:29.515330134 +0100
-+++ bluez-4.31/common/Makefile.am	2009-02-27 22:58:11.249328307 +0100
-@@ -4,6 +4,8 @@
- libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \
- 		glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c btio.h btio.c
- 
-+libhelper_a_LIBADD = @BLUEZ_LIBS@
-+
- noinst_PROGRAMS = test_textfile
- 
- test_textfile_LDADD = libhelper.a
-diff -Naur bluez-4.31.orig/test/Makefile.am bluez-4.31/test/Makefile.am
---- bluez-4.31.orig/test/Makefile.am	2009-02-27 22:57:29.518659538 +0100
-+++ bluez-4.31/test/Makefile.am	2009-02-27 23:07:09.294597176 +0100
-@@ -23,13 +23,13 @@
- 
- bdaddr_SOURCES = bdaddr.c
- 
--bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-+bdaddr_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
- 
- lmptest_LDADD = @BLUEZ_LIBS@
- 
- agent_LDADD = @DBUS_LIBS@
- 
--btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-+btiotest_LDADD = @GLIB_LIBS@ $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
- 
- noinst_MANS = bdaddr.8
- 
diff --git a/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/net-wireless/bluez/files/4.34-conditional_libsbc.patch
deleted file mode 100644
index e4924c79be87..000000000000
--- a/net-wireless/bluez/files/4.34-conditional_libsbc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-The configure stuff is a inconsequent:
-- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la
-  which doesn't get build without alsa or gstreamer. Making this conditional helps.
-- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty,
-  making the build conditional helps again.
---- acinclude.m4.orig	2009-04-06 16:26:14.570780241 +0200
-+++ acinclude.m4	2009-04-06 16:26:59.540779148 +0200
-@@ -330,8 +330,10 @@
- 	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
- 	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
- 
--	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
--	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
-+	if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then
-+		AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
-+		AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
-+	fi
- 
- 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
---- audio/Makefile.am.orig	2009-04-06 16:47:21.240681272 +0200
-+++ audio/Makefile.am	2009-04-06 17:42:27.240597715 +0200
-@@ -60,10 +60,16 @@
- 
- libipc_la_SOURCES = ipc.h ipc.c
- 
-+if AUDIOPLUGIN
-+if SBC
-+
- noinst_PROGRAMS = ipctest
- 
- ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
- 
-+endif
-+endif
-+
- AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \
- 		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
- 
diff --git a/net-wireless/bluez/files/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
new file mode 100644
index 000000000000..b0cc744415ad
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-conf.d
@@ -0,0 +1,7 @@
+# Bluetooth configuraton file
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
diff --git a/net-wireless/bluez/files/bluetooth-init.d b/net-wireless/bluez/files/bluetooth-init.d
index 6e19ffb0d03f..6339f99c738e 100644
--- a/net-wireless/bluez/files/bluetooth-init.d
+++ b/net-wireless/bluez/files/bluetooth-init.d
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d,v 1.1 2010/09/07 11:00:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d,v 1.2 2011/03/20 16:57:35 pacho Exp $
 
 depend() {
 	after coldplug
-	need dbus localmount
+	need dbus localmount hostname
 }
 
 start() {
diff --git a/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch b/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
deleted file mode 100644
index 6304a6f0ac79..000000000000
--- a/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f62006a86143f2c8556b4e6f3e74508db6b2aa5d Mon Sep 17 00:00:00 2001
-From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
-Date: Mon, 8 Mar 2010 20:01:32 -0300
-Subject: [PATCH 1/1] Fix compilation when --enable-test is passed
-
-When --enable-test is passed along with --disable-alsa and
---disable-gstreamer, the SBC lib is not built, which breaks
-compilation of the ipctest test program.
----
- acinclude.m4 |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2e4444d..f7bb047 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -316,7 +316,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 
- 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
--	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes")
-+	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
-+									test "${test_enable}" = "yes")
- 	AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
- 	AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes")
- 	AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
--- 
-1.7.0.2
-
diff --git a/net-wireless/bluez/files/bluez-alsa_location.patch b/net-wireless/bluez/files/bluez-alsa_location.patch
deleted file mode 100644
index 4d0712c67141..000000000000
--- a/net-wireless/bluez/files/bluez-alsa_location.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-bluez installs stuff into /etc/alsa, which is wrong since the
-correct location (also stated in alsa-lib configure.in) is
-/usr/share/alsa instead
-Upstream report: 
-http://permalink.gmane.org/gmane.linux.bluez.kernel/4739
---- Makefile.am~	2010-02-12 20:26:48.000000000 +0100
-+++ Makefile.am	2010-03-05 10:17:15.000000000 +0100
-@@ -241,7 +241,7 @@
- audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
- 
- if CONFIGFILES
--alsaconfdir = $(sysconfdir)/alsa
-+alsaconfdir = $(datadir)/alsa
- 
- alsaconf_DATA = audio/bluetooth.conf
- endif
diff --git a/net-wireless/bluez/files/conf.d-hidd b/net-wireless/bluez/files/conf.d-hidd
new file mode 100644
index 000000000000..1677ef0f3556
--- /dev/null
+++ b/net-wireless/bluez/files/conf.d-hidd
@@ -0,0 +1,5 @@
+# Bluetooth hidd daemon configuraton file
+
+# Arguments to hidd
+HIDD_OPTIONS="--encrypt"
+