Version bump with some upstream fixes.

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

3 files changed, 198 insertions, 5 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 11f112ddffb1..78d475e30dfa 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2010/11/25 23:36:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.63 2010/12/10 19:51:22 pacho Exp $
+
+*bluez-4.81 (10 Dec 2010)
+
+  10 Dec 2010; Pacho Ramos <pacho@gentoo.org> +bluez-4.81.ebuild:
+  Version bump with some upstream fixes.
 
 *bluez-4.80 (25 Nov 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 71440363d13b..7a59d5ed02ca 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -24,18 +24,21 @@ DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SH
 DIST bluez-4.75.tar.gz 1081608 RMD160 ff1efd6f179fcf506a48f0c3bfef5a1174a9c0ca SHA1 da50e5f5fef2d3f622589395313ed28827d6666b SHA256 fd861de5c966dc563e6a1c34400bb0c0fe1277e37655ab3ce3f48356035f61b8
 DIST bluez-4.77.tar.gz 1092738 RMD160 61074ed32f1003c7af91a0295ff5e89045e6652f SHA1 adad98dcf933f6f358f820f3ef3ffdf805a9f090 SHA256 9d77a0d9cd6b207304ae5446926a57ad492002602cfd64e622898bd878f248f3
 DIST bluez-4.80.tar.gz 1102744 RMD160 185b4fe1bbcb4310ea012b7e100d29ea01376b00 SHA1 37b71bb7229d65cd2edfb09119cf5ae20e6a3c5b SHA256 4e42fb6c14ad958b5d927c7cace8d69670de0215308dd90001f28d74aa630dff
+DIST bluez-4.81.tar.gz 1104444 RMD160 700c3ac877279bcb4636ed175ea3cdbb04107967 SHA1 852c79e2af55ca7db4e4dd66a2e98f839464093b SHA256 a249919f73b52b317f79d1096739df3dd987b8db908d137ab474f4d1a1fa7fc7
 DIST oui-20101126.txt 2291761 RMD160 4eff1bf435eef45bde1e02152974e8ba2268d1c1 SHA1 3908e24ca12ce0b0e5047408077ffece4eec428a SHA256 d7bd3c5908cf9d156e899aaaafa37af72970032be4347ca47043b1cf883d6977
+DIST oui-20101210.txt 2301336 RMD160 202b4f1b487ed4032d824cb04bb44b751a2ef947 SHA1 e9c54cc7def4480fb9b2226265690fcf7079a623 SHA256 98e32e93ba9cc3370969d7e7e7f93ee63013e8a59a5f0a05cff2874f1fb5251b
 DIST oui.txt 2290876 RMD160 17aaf1cac62da8d95cc221e07966988128bb376c SHA1 2c9b743230971dd38b0494ec542c6b052925aad2 SHA256 a48bd8b7734286341c8791c2dfaafaabc8bff16c1bdf80930c306c0ea5384f27
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.75.ebuild 5193 RMD160 17f2283d9c308c54a604209dca9fe2c6d8f3ab1b SHA1 e1d1f1bca330ca3b34ad666fc53395c83288f205 SHA256 b56b9e55c703c15fa6fe75f8ac5e1fe1d78992a6da35d405ae5d63a173cf0b82
 EBUILD bluez-4.77.ebuild 5205 RMD160 d432c99ea0205a7a0cd8ec6151e1dee28cc6084e SHA1 cd60406cb92d724d9c9ca72c2992589c5d364e91 SHA256 b5550972c9dfdbcc94424ce3aae97969e6a09fd9a4a2d48c1330326ced36c5a5
 EBUILD bluez-4.80.ebuild 5432 RMD160 ef7fa296370b259c5a5f443acefa84f76e034a78 SHA1 fe38a15d65e7b16ebe1d2a9f3d73ea4b730cffe5 SHA256 3e928cfc3b9abe848953b55c6b239cfae88afef486d77040b271fe0b11838fd6
-MISC ChangeLog 12658 RMD160 086fdae0f8da3975acb35b0e45584f4971a3a806 SHA1 6883cd51403cd659d1a4beb709e4d2f39378fd2a SHA256 3364bd0d7de109adfa6a3c7f892da7fa975d5ea4dd73cee3d65abbf95db39ff3
+EBUILD bluez-4.81.ebuild 5432 RMD160 85b46bbc484041f69df234bb9e5a847e6579d486 SHA1 f0259585e93f898fe8c74fd8481bfbd6e6189d34 SHA256 85f9e6d30fca7e3fa5f1684377cf53a90298c4f57716d8c55ef79275235f6fe3
+MISC ChangeLog 12793 RMD160 87de4e28cc3560813cbd57f16e2403a5cc394b42 SHA1 02665c25801decd31cf25864e2bc4de2be3b442c SHA256 a1eed17afa57aa33587db0f207061f199f3f32fda6d68320d05080e35cd93ec6
 MISC metadata.xml 1052 RMD160 5df0b0075716e5e6aee6ebcb4b734c61ca4e372e SHA1 9b13c6123b253d99e742c8a1e9be5ed50b430c80 SHA256 7006466957d5bb3c892604d1e76093d1ee2ba9fc85ebe6459f643138af174c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzu8wEACgkQCaWpQKGI+9T53gCfVj5rw3SHI45qDEP4AtwfqP5/
-LGYAnj2dV514Zjq5QjrYRHAhDc/qpz3K
-=wTak
+iEYEARECAAYFAk0ChMAACgkQCaWpQKGI+9QuhQCghXT5Onp3Gd/G82Lr3UM5dmtg
+gjAAnjIy4Yuh5158EEPMkbS0guHQp8wo
+=4UgY
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.81.ebuild b/net-wireless/bluez/bluez-4.81.ebuild
new file mode 100644
index 000000000000..964b4a3c2037
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.81.ebuild
@@ -0,0 +1,185 @@
+# 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.81.ebuild,v 1.1 2010/12/10 19:51:22 pacho Exp $
+
+EAPI="3"
+
+inherit multilib eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org/"
+
+OUIDATE="20101210" # Needed because of bug #345263
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+	http://standards.ieee.org/regauth/oui/oui.txt -> 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
+		>=media-libs/gst-plugins-base-0.10 )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	>=sys-fs/udev-146[extras]
+	>=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
+		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="${ED}" 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 || die
+		newbin list-devices list-bluetooth-devices || die
+		for b in apitest hsmicro hsplay test-* ; do
+			newbin "${b}" "bluez-${b}" || die
+		done
+		insinto /usr/share/doc/${PF}/test-services
+		doins service-* || die
+
+		cd "${S}"
+	fi
+
+	if use old-daemons; then
+		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
+		newinitd "${FILESDIR}/init.d-hidd" hidd || die
+		newconfd "${FILESDIR}/conf.d-dund" dund || die
+		newinitd "${FILESDIR}/init.d-dund" dund || 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}/bluetooth-init.d" bluetooth || die
+	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
+
+	# Install oui.txt as requested in bug #283791 and approved by upstream
+	insinto /var/lib/misc
+	newins "${DISTDIR}/oui-${OUIDATE}.txt" oui.txt || die
+
+	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
+}