Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 271 insertions, 34 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index af43a863b892..587ddb921367 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,38 @@
 # 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.109 2011/12/24 15:46:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.110 2011/12/31 21:09:18 pacho Exp $
+
+*bluez-4.97-r1 (31 Dec 2011)
+*bluez-4.97 (31 Dec 2011)
+
+  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +files/bluez-4.67-udev.script,
+  -bluez-4.96-r2.ebuild, +bluez-4.97.ebuild, +bluez-4.97-r1.ebuild,
+  +files/rfcomm-conf.d, +files/rfcomm-init.d:
+  Version bump that also includes IMPORTANT changes:
+  - old-daemons were dropped because they are poorly maintained and I am unable
+    to test them. Also have some problems and look to not work at all in default
+    setups (bug #381355 by Agostino Sarubbo and Rafał Mużyło). If you think you
+    still need some of them, please open a new bug report explaining your needs
+    to let us find a replacement or, if none is available, readd only needed old
+    daemons.
+  - 'bluetooth' init.d script has been completely removed as it was only
+    calling "udevadm trigger --subsystem-match=bluetooth --action=add" at startup. 
+    This instruction is now called directly by /lib/udev/bluetooth.sh (the one that
+    was previously calling init.d script and causing problems on systemd setups as 
+    reported by mgorny and others (bug #396403), this should also solve bug #389531.
+    Due this change, it's possible that you will start to see how your bluetooth
+    device is not properly detected just after booting if not manually running
+    "udevadm trigger --subsystem-match=bluetooth --action=add", if this is your case,
+    please report a bug to readd a bluetooth init.d script for that (even without
+    getting it automatically started by udev to not hurt systemd users).
+  - Because of previous change, 'rfcomm' part of old bluetooth init.d script has been
+    moved to its own script under /etc/init.d and conf.d.
+  - Due bug 392879 (by Otamay) I have rethink the way some plugins were being 
+    installed or not to simply always build and install them. This adds no additional
+    dependencies, also simplifies ebuild preventing it from growing forever with a
+    lot of USE flags and, probably the most important one, makes bluez to simply 
+    support and work with more devices.
+  Also remove old.
 
   24 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> bluez-4.96-r2.ebuild:
   Make bluez depend on python only when USE=test-programs
diff --git a/net-wireless/bluez/bluez-4.96-r2.ebuild b/net-wireless/bluez/bluez-4.97-r1.ebuild
index 2555b5e9437e..cde5b6c24214 100644
--- a/net-wireless/bluez/bluez-4.96-r2.ebuild
+++ b/net-wireless/bluez/bluez-4.97-r1.ebuild
@@ -1,9 +1,8 @@
 # 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.96-r2.ebuild,v 1.2 2011/12/24 15:46:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r1.ebuild,v 1.1 2011/12/31 21:09:18 pacho Exp $
 
 EAPI="4"
-
 PYTHON_DEPEND="test-programs? 2"
 
 inherit multilib eutils systemd python
@@ -14,14 +13,14 @@ 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="20110801"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+OUIDATE="20111231"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
 	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"
+IUSE="alsa caps +consolekit cups debug gstreamer pcmcia test-programs usb"
 
 CDEPEND="
 	>=dev-libs/glib-2.14:2
@@ -41,6 +40,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	>=dev-util/pkgconfig-0.20
+	>=dev-libs/check-0.9.4
 	sys-devel/flex
 "
 RDEPEND="${CDEPEND}
@@ -62,6 +62,7 @@ pkg_setup() {
 	if ! use consolekit; then
 		enewgroup plugdev
 	fi
+
 	if use test-programs; then
 		python_pkg_setup
 	fi
@@ -82,11 +83,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--enable-hid2hci \
 		--enable-audio \
 		--enable-bccmd \
 		--enable-datafiles \
 		--enable-dfutool \
-		--enable-hid2hci \
 		--enable-input \
 		--enable-network \
 		--enable-serial \
@@ -100,15 +101,13 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable debug) \
 		$(use_enable gstreamer) \
-		$(use_enable health) \
-		$(use_enable maemo6) \
-		$(use_enable old-daemons dund) \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
 		$(use_enable pcmcia) \
-		$(use_enable pnat) \
 		$(use_enable test-programs test) \
-		$(use_enable usb)
+		$(use_enable usb) \
+		--enable-health \
+		--enable-maemo6 \
+		--enable-pnat \
+		--enable-wiimote
 }
 
 src_install() {
@@ -129,13 +128,6 @@ src_install() {
 		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 \
@@ -146,16 +138,16 @@ src_install() {
 	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
+	newexe "${FILESDIR}/${PN}-4.67-udev.script" bluetooth.sh
 
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
-	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
+	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
+	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
 
 	# 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
+	find "${D}" -name "*.la" -delete
 }
 
 pkg_postinst() {
@@ -165,14 +157,6 @@ pkg_postinst() {
 		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."
diff --git a/net-wireless/bluez/bluez-4.97.ebuild b/net-wireless/bluez/bluez-4.97.ebuild
new file mode 100644
index 000000000000..301baf8e04ff
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.97.ebuild
@@ -0,0 +1,168 @@
+# 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.97.ebuild,v 1.1 2011/12/31 21:09:18 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="test-programs? 2"
+
+inherit multilib eutils systemd python
+
+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="20111231"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
+	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 pcmcia test-programs usb"
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	sys-apps/dbus
+	>=sys-fs/udev-146[extras]
+	alsa? (
+		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
+		media-libs/libsndfile
+	)
+	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
+	>=dev-libs/check-0.9.4
+	sys-devel/flex
+"
+RDEPEND="${CDEPEND}
+	!net-wireless/bluez-libs
+	!net-wireless/bluez-utils
+	consolekit? (
+		|| ( sys-auth/consolekit
+			>=sys-apps/systemd-37 )
+	)
+	test-programs? (
+		dev-python/dbus-python
+		dev-python/pygobject:2
+	)
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+pkg_setup() {
+	if ! use consolekit; then
+		enewgroup plugdev
+	fi
+
+	if use test-programs; then
+		python_pkg_setup
+	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 \
+		--enable-audio \
+		--enable-bccmd \
+		--enable-datafiles \
+		--enable-dfutool \
+		--enable-input \
+		--enable-network \
+		--enable-serial \
+		--enable-service \
+		--enable-tools \
+		--disable-hal \
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_unitdir)" \
+		$(use_enable alsa) \
+		$(use_enable caps capng) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable gstreamer) \
+		$(use_enable pcmcia) \
+		$(use_enable test-programs test) \
+		$(use_enable usb) \
+		--enable-health \
+		--enable-maemo6 \
+		--enable-pnat \
+		--enable-wiimote
+}
+
+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-*
+
+		python_convert_shebangs -r 2 "${ED}"
+		cd "${S}"
+	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.67-udev.script" bluetooth.sh
+
+	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
+	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
+
+	# Install oui.txt as requested in bug #283791 and approved by upstream
+	insinto /var/lib/misc
+	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
+
+	find "${D}" -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 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
+}
diff --git a/net-wireless/bluez/files/bluez-4.67-udev.script b/net-wireless/bluez/files/bluez-4.67-udev.script
new file mode 100644
index 000000000000..b176611d9d6e
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-4.67-udev.script
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# bluetooth.sh: udev external RUN script
+#
+# Copyright:
+#	2005-2006 Henrik Brix Andersen <brix@gentoo.org>
+#	2007      Petteri Räty <betelgeuse@gentoo.org>
+#	2008      Tiziano Müller <dev-zero@gentoo.org>
+#	2011	  Pacho Ramos <pacho@gentoo.org> 
+# Distributed under the terms of the GNU General Public License v2
+
+# Find out where sysfs is mounted. Exit if not available
+sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'`
+if [ "$sysfs" = "" ]; then
+	echo "sysfs is required"
+	exit 1
+fi
+
+if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then
+	udevadm trigger --subsystem-match=bluetooth --action=add
+fi
diff --git a/net-wireless/bluez/files/rfcomm-conf.d b/net-wireless/bluez/files/rfcomm-conf.d
new file mode 100644
index 000000000000..d87acdb282eb
--- /dev/null
+++ b/net-wireless/bluez/files/rfcomm-conf.d
@@ -0,0 +1,5 @@
+# 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/rfcomm-init.d b/net-wireless/bluez/files/rfcomm-init.d
new file mode 100644
index 000000000000..d3b819e1abea
--- /dev/null
+++ b/net-wireless/bluez/files/rfcomm-init.d
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# 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/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount hostname
+}
+
+start() {
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "Starting rfcomm"
+			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Shutting down rfcomm"
+	/usr/bin/rfcomm release all
+	eend $?	
+}