Fix bug 319621 and version bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 179 insertions, 3 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 2a378b4603a6..a8e4dc6451e3 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2010/06/07 20:15:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.38 2010/06/11 10:14:00 pacho Exp $
+
+*bluez-4.65 (11 Jun 2010)
+
+  11 Jun 2010; Pacho Ramos <pacho@gentoo.org> files/4.60/bluetooth-init.d,
+  +bluez-4.65.ebuild:
+  Fix udevadm usage per bug 319621 (Thanks to Thorsten Vollmer and Reuben
+  Martin). Version bump with bugfixes.
 
   07 Jun 2010; Markus Meier <maekke@gentoo.org> bluez-4.64.ebuild:
   add ~arm, bug #303527
diff --git a/net-wireless/bluez/bluez-4.65.ebuild b/net-wireless/bluez/bluez-4.65.ebuild
new file mode 100644
index 000000000000..88fe6a275c85
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.65.ebuild
@@ -0,0 +1,169 @@
+# 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.65.ebuild,v 1.1 2010/06/11 10:14:00 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 ~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
+	>=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-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-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/files/4.60/bluetooth-init.d b/net-wireless/bluez/files/4.60/bluetooth-init.d
index 111902aaeb55..42f223896bb6 100644
--- a/net-wireless/bluez/files/4.60/bluetooth-init.d
+++ b/net-wireless/bluez/files/4.60/bluetooth-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.1 2010/02/01 19:47:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.2 2010/06/11 10:14:00 pacho Exp $
 
 depend() {
 	after coldplug
@@ -11,7 +11,7 @@ depend() {
 start() {
    	ebegin "Starting Bluetooth"
 
-	udevadm trigger --subsystem-match=bluetooth
+	udevadm trigger --subsystem-match=bluetooth --action=add
 	eend $?
 
 	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then