Add IUSE=consolekit to control pambase dep. Give all rights to users in plugdev only if we're not using ConsoleKit. Also, use +consolekit (upstream defaults)

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 187 insertions, 3 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 1e3cb0e80a24..1aef3a994fb4 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.13 2009/09/20 19:34:34 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.14 2009/09/20 20:01:04 nirbheek Exp $
+
+*bluez-4.39-r2 (20 Sep 2009)
+
+  20 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org> +bluez-4.39-r2.ebuild:
+  Add IUSE=consolekit to control pambase dep. Give all rights to users in
+  plugdev only if we're not using ConsoleKit. Also, use +consolekit
+  (upstream defaults)
 
   20 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org> bluez-4.28.ebuild,
   bluez-4.38.ebuild, bluez-4.39.ebuild, bluez-4.39-r1.ebuild:
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index dd136c2259a8..98012fc81d56 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -14,6 +14,7 @@ DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SH
 EBUILD bluez-4.28.ebuild 4907 RMD160 bb00cdefb3b9f8c58b0cbe7da6f1a6b0a3e5458f SHA1 4ef1351d54d95ebaa6efeff57c381ec685744442 SHA256 bfaf4aad3bda449b04bd6fa5c020be9ec710babb1a7a46a70a774c592f016505
 EBUILD bluez-4.38.ebuild 5069 RMD160 88b34a8873151b6d87b581d535bfb1c2c338b902 SHA1 a83d8d79725404ec736ede34c5de23b681cd1ec1 SHA256 86ced076b6417ab22f2548bf84cf5fb850ecdd8be6ba2360c891b151c79432b1
 EBUILD bluez-4.39-r1.ebuild 5114 RMD160 0c5827b9a110df58982132e27a12bd6a3f3df309 SHA1 5db15bb0f6cedb3671bcc78b8b54ba6630abd0a7 SHA256 e93d746670b5b916a1875eb083eece214eeaccc3e2d50767b76ee078200fa7b3
+EBUILD bluez-4.39-r2.ebuild 5244 RMD160 372304868acfe24851ed63ea0437cff0c839d4fa SHA1 338f335a97bfd55a72ff63239c2a24c0afeee824 SHA256 b6a5767122ae2b1d1e053a4d7359e05be0202867c2cb85397c9c454f6bd1a83f
 EBUILD bluez-4.39.ebuild 5069 RMD160 a259e1816dbab10faa7868066f30716749412b08 SHA1 dd08230f661ef4ba273bf95866db3e4c57ec050e SHA256 71c1ac1b22c0f7eb0aa7c705d3a632ed4fedcd53c3146eaa34f388b5e313dade
-MISC ChangeLog 2762 RMD160 bf3b1beacf962b5c622670a29862762b4b59eafc SHA1 4f44b378b391da031c00ccc0183900b7d0deb4ce SHA256 d78815c8a5e2b9f047f17228294f3ccc69ef5928da89bf980af45a9cc4245e40
-MISC metadata.xml 514 RMD160 89fa06d58b02ddf9cf942c3e8662cbdc70e14587 SHA1 5f91b2a84e74029a5f8eb7362d6412b36518cdec SHA256 03647e723337dcd35c89f4dfcecaeeefba99883d690e6e91320804d5f8a22f9e
+MISC ChangeLog 3034 RMD160 3a10f849de60dbd9389fdd4fa9af5e7a37be2484 SHA1 053e2f82e9fc6d0b0b0f3360600b54555bb38c34 SHA256 a9abfb59872dd3b1e87f697f001a2b9bb3dfb647cd5a88192279078ad3571b5d
+MISC metadata.xml 695 RMD160 22c624b70b3a7cbf46877876aff36110331c6371 SHA1 0ccc35bd0904748aad03bf95560bd01c14571623 SHA256 3468c8be9e77005075bb150b5fcfb0f10ae3fa0e2775fde2a3ff259852c5f8d5
diff --git a/net-wireless/bluez/bluez-4.39-r2.ebuild b/net-wireless/bluez/bluez-4.39-r2.ebuild
new file mode 100644
index 000000000000..8fb1ba9e3f4e
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.39-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2009 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.1 2009/09/20 20:01:04 nirbheek 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 ~sh ~sparc ~x86"
+
+IUSE="alsa +consolekit cups debug doc gstreamer old-daemons test-programs usb"
+
+CDEPEND="alsa? ( media-libs/alsa-lib )
+	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/metadata.xml b/net-wireless/bluez/metadata.xml
index 4df5da7d6d51..0b302bf7d038 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -10,6 +10,9 @@
 		<email>betelgeuse@gentoo.org</email>
 	</maintainer>
 	<use>
+		<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='old-daemons'>Install old daemons like hidd and sdpd that are
 			deprecated by the new Service framework</flag>
 		<flag name='test-programs'>Install l2test and rctest</flag>