Rely on hid2hci from udev only when really supplied by that udev version, as it was moved back to bluez in recent releases.

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

3 files changed, 193 insertions, 5 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 918c2d18e72b..b11c28f32ea1 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2011/06/05 12:17:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.91 2011/06/08 10:42:41 pacho Exp $
+
+*bluez-4.94-r1 (08 Jun 2011)
+
+  08 Jun 2011; Pacho Ramos <pacho@gentoo.org> +bluez-4.94-r1.ebuild:
+  Rely on hid2hci from udev only when really supplied by that udev version, as
+  it was moved back to bluez in recent releases.
 
 *bluez-4.94 (05 Jun 2011)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 8cf76f64198c..3f0040146c5b 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -29,13 +29,14 @@ DIST oui-20110605.txt.xz 513744 RMD160 9d6d09d1cc8fbabe9b4d23395e9e2f401be6d3c5
 EBUILD bluez-4.87.ebuild 5642 RMD160 a1da5c51be06ad13e38882f8ef0743c625039141 SHA1 f75a250518751965b12a4f74b70a611bce2b6e85 SHA256 27e24d62f1521a4bff9e23664cd48eb20cd1be16f64bda879b27d008b65cb767
 EBUILD bluez-4.91.ebuild 4822 RMD160 f18b55ac842b536edc6bb21f98c320bbdbda6da9 SHA1 8ba4e2fc3e2c3572d0e6956bbc4117a10592d963 SHA256 fbc5cd838621ac69e1b243243bce99c5c842e42af3b6315d660f02f11aeee2bc
 EBUILD bluez-4.93.ebuild 4796 RMD160 13a8ca7858fc4617172f65bd7e061f3c44a9c28e SHA1 c3ce1f5192577b87fda664e755c356c5f8b6781c SHA256 2327a947383bd160aa11e96a3df436137651d5e9766763fd0c47bd88d6b9b792
+EBUILD bluez-4.94-r1.ebuild 4927 RMD160 568dd792080dd71e087316f9191f6d7ca04830ec SHA1 a67a774dd479ba3993cf323d2f1e8cad0dd0c1e8 SHA256 ce8769a64abc16489a4d63e5596d9e75c2742ea5935426642af3fdb1d6294913
 EBUILD bluez-4.94.ebuild 4796 RMD160 3f17dcba87c2a10f0cdeef43ba9827572ba63984 SHA1 992ef07315ddcf4b519fb795ff0f2d3e16095521 SHA256 27d45cbc0896f9afe2f23a9cc8949b9f953144e9c261497db902eb5bc631a897
-MISC ChangeLog 16808 RMD160 b86278d5741d847ecd0082d51d1c12dd3536a687 SHA1 5a2e65164d6efd613cb9c71c25e680ac5f9e598c SHA256 38ec9716573a270c2dd9c5f9941ecae4463f1d1dad2aead9b9cecc0988d995f5
+MISC ChangeLog 17036 RMD160 9e3173a49cd36044493f59ca3372bd681492bccf SHA1 5d084ff62593b70b4cf8ac31e52be9bff2aadf06 SHA256 6836135be0e3ffa6dd3c9838191a81e9d4c0b60509c7084d82671d2535f3b82a
 MISC metadata.xml 1052 RMD160 5df0b0075716e5e6aee6ebcb4b734c61ca4e372e SHA1 9b13c6123b253d99e742c8a1e9be5ed50b430c80 SHA256 7006466957d5bb3c892604d1e76093d1ee2ba9fc85ebe6459f643138af174c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rc9EACgkQCaWpQKGI+9SSlgCfcDcSMb6ZeD4ViAZVugpZqw/t
-oD8An0fodgMJNBGgvxahneYHj/FV4C3u
-=1C9y
+iEYEARECAAYFAk3vUiYACgkQCaWpQKGI+9RvUgCeLHh9H3lqmB6kgYhX0L6/aZWF
+Hz8An0DTjL3Ykm7YUYhTRcMIFEJT0Yws
+=3zyr
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.94-r1.ebuild b/net-wireless/bluez/bluez-4.94-r1.ebuild
new file mode 100644
index 000000000000..d73f4a539312
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.94-r1.ebuild
@@ -0,0 +1,181 @@
+# 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.94-r1.ebuild,v 1.1 2011/06/08 10:42:41 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="20110605"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="alsa caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	media-libs/libsndfile
+	sys-apps/dbus
+	|| ( >=sys-fs/udev-146[extras] >=sys-fs/udev-169 )
+	alsa? (
+		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
+	)
+	caps? ( >=sys-libs/libcap-ng-0.6.2 )
+	cups? ( net-print/cups )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10
+	)
+	usb? ( dev-libs/libusb:1 )
+"
+DEPEND="${CDEPEND}
+	>=dev-util/pkgconfig-0.20
+	sys-devel/flex
+"
+RDEPEND="${CDEPEND}
+	!net-wireless/bluez-libs
+	!net-wireless/bluez-utils
+	consolekit? ( sys-auth/consolekit )
+	test-programs? (
+		dev-python/dbus-python
+		dev-python/pygobject:2
+	)
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+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() {
+	local myconf
+	if has_version ">=sys-fs/udev-169"; then
+		myconf="--enable-hid2hci"
+	fi
+
+	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 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 \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	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 /lib/udev/rules.d/
+	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
+	exeinto /lib/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 "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
+
+	find "${ED}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
+
+	if ! has_version "net-dialup/ppp"; then
+		elog "To use dial up networking you must install net-dialup/ppp."
+	fi
+
+	if use old-daemons; then
+		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
+
+	if use consolekit; then
+		elog "If you want to use rfcomm as a normal user, you need to add the user"
+		elog "to the uucp group."
+	else
+		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
+}