Version bump with multiple upstream fixes, also handle oui.txt file downloading in a better way as suggested by Zac in bug #345263, update HOMEPAGE, remove .la files, and fix cups location (bug #346033 by Florian Steinel). Remove old.

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

3 files changed, 73 insertions, 48 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index a76d0b71d789..11f112ddffb1 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,15 @@
 # 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.61 2010/11/09 22:37:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.62 2010/11/25 23:36:27 pacho Exp $
+
+*bluez-4.80 (25 Nov 2010)
+
+  25 Nov 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.69.ebuild,
+  +bluez-4.80.ebuild:
+  Version bump with multiple upstream fixes, also handle oui.txt file
+  downloading in a better way as suggested by Zac in bug #345263, update
+  HOMEPAGE, remove .la files, and fix cups location (bug #346033 by Florian
+  Steinel). Remove old.
 
   09 Nov 2010; Pacho Ramos <pacho@gentoo.org> ChangeLog:
   Fix digest (bug #344815 by Isidoro Garcia).
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3220982b6b57..71440363d13b 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -21,20 +21,21 @@ AUX conf.d-dund 96 RMD160 cf0a59a45f6f1bab134e4aab3545a94dfe094ae0 SHA1 c8d3196d
 AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ecdf6d973c09553ed525e97e1cad2d6261f SHA256 e4985a2295d1cd2361b4a6a01b2d474820bf66cb1ff9251742d7aacd0fa574aa
 AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
-DIST bluez-4.69.tar.gz 997733 RMD160 03be499fdb5064e0ec1440eddbcc452f5448566a SHA1 488a70627dd40d8a138477d5363ff1444bce77bd SHA256 10e67a9349bbd7aecc177631c2703e9bd346dffe10a4b70b058c3a1da8b98ec0
 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 oui-20101126.txt 2291761 RMD160 4eff1bf435eef45bde1e02152974e8ba2268d1c1 SHA1 3908e24ca12ce0b0e5047408077ffece4eec428a SHA256 d7bd3c5908cf9d156e899aaaafa37af72970032be4347ca47043b1cf883d6977
 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.69.ebuild 4873 RMD160 75b097d0c6027cc5e9f780f6a6e5a5780d72be98 SHA1 327fe532709a3accd14a35453988a3acd76e449a SHA256 e645f7ec152a080dd7f1f9c162a7a2a6337cf88a55926f48e404c0e7e2991bc0
 EBUILD bluez-4.75.ebuild 5193 RMD160 17f2283d9c308c54a604209dca9fe2c6d8f3ab1b SHA1 e1d1f1bca330ca3b34ad666fc53395c83288f205 SHA256 b56b9e55c703c15fa6fe75f8ac5e1fe1d78992a6da35d405ae5d63a173cf0b82
 EBUILD bluez-4.77.ebuild 5205 RMD160 d432c99ea0205a7a0cd8ec6151e1dee28cc6084e SHA1 cd60406cb92d724d9c9ca72c2992589c5d364e91 SHA256 b5550972c9dfdbcc94424ce3aae97969e6a09fd9a4a2d48c1330326ced36c5a5
-MISC ChangeLog 12299 RMD160 69d49c451ff9e0a20a9c496fa20df1d55fe6ebcd SHA1 6311853fef59581362f6370541c05464a7928163 SHA256 ff80907b912101c3fdee549823b3f4ca73545289114de30b2c4a0e10e542582f
+EBUILD bluez-4.80.ebuild 5432 RMD160 ef7fa296370b259c5a5f443acefa84f76e034a78 SHA1 fe38a15d65e7b16ebe1d2a9f3d73ea4b730cffe5 SHA256 3e928cfc3b9abe848953b55c6b239cfae88afef486d77040b271fe0b11838fd6
+MISC ChangeLog 12658 RMD160 086fdae0f8da3975acb35b0e45584f4971a3a806 SHA1 6883cd51403cd659d1a4beb709e4d2f39378fd2a SHA256 3364bd0d7de109adfa6a3c7f892da7fa975d5ea4dd73cee3d65abbf95db39ff3
 MISC metadata.xml 1052 RMD160 5df0b0075716e5e6aee6ebcb4b734c61ca4e372e SHA1 9b13c6123b253d99e742c8a1e9be5ed50b430c80 SHA256 7006466957d5bb3c892604d1e76093d1ee2ba9fc85ebe6459f643138af174c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzsAHIACgkQCaWpQKGI+9R5GwCfSzBynvpn2ahzXV/o26WGt3aT
-TwAAoIVUi1fRDDfLieDUT5HTA5N8TUXk
-=H9j2
+iEYEARECAAYFAkzu8wEACgkQCaWpQKGI+9T53gCfVj5rw3SHI45qDEP4AtwfqP5/
+LGYAnj2dV514Zjq5QjrYRHAhDc/qpz3K
+=wTak
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.69.ebuild b/net-wireless/bluez/bluez-4.80.ebuild
index 1a3b3ae7d127..dc749f4c66cc 100644
--- a/net-wireless/bluez/bluez-4.69.ebuild
+++ b/net-wireless/bluez/bluez-4.80.ebuild
@@ -1,19 +1,22 @@
 # 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.69.ebuild,v 1.5 2010/09/25 13:51:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.80.ebuild,v 1.1 2010/11/25 23:36:27 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit autotools multilib eutils
+inherit multilib eutils
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
+HOMEPAGE="http://www.bluez.org/"
+
+OUIDATE="20101126" # 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"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE="alsa caps +consolekit cups debug gstreamer maemo6 old-daemons pcmcia test-programs usb"
+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]
@@ -53,13 +56,9 @@ src_prepare() {
 	fi
 
 	if use cups; then
-		epatch "${FILESDIR}/4.60/cups-location.patch"
+		sed -i -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
+			Makefile.tools Makefile.in || die
 	fi
-
-	# Fix alsa files location
-	epatch "${FILESDIR}/${PN}-alsa_location.patch"
-
-	eautoreconf
 }
 
 src_configure() {
@@ -73,13 +72,15 @@ src_configure() {
 		$(use_enable gstreamer) \
 		$(use_enable alsa) \
 		$(use_enable usb) \
-		--enable-netlink \
 		--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) \
@@ -87,30 +88,33 @@ src_configure() {
 		--enable-configfiles \
 		$(use_enable pcmcia) \
 		$(use_enable debug) \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-hal
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	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
-		newbin list-devices list-bluetooth-devices
+		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}"
+			newbin "${b}" "bluez-${b}" || die
 		done
 		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
+		doins service-* || die
 
 		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
+		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
@@ -126,33 +130,44 @@ src_install() {
 	exeinto /$(get_libdir)/udev/
 	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
 
-	newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || 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
 
-	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 ! 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
 		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
 		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"
@@ -160,10 +175,10 @@ pkg_postinst() {
 	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
+		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