Version bump and lots of fixes

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

6 files changed, 239 insertions, 2 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 990ddba06949..31f25e9321e6 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,16 @@
 # 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.21 2010/01/14 01:24:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.22 2010/02/01 19:47:45 pacho Exp $
+
+*bluez-4.60 (01 Feb 2010)
+
+  01 Feb 2010; Pacho Ramos <pacho@gentoo.org> +files/4.60/bluetooth-conf.d,
+  +files/4.60/bluetooth-init.d, +files/4.60/cups-location.patch,
+  +bluez-4.60.ebuild:
+  Version bump (bug 270859), includes lots of bugfixes, thanks to Gustavo F.
+  Padovan, Davide Pesavento, James Le Cuirot, Matthew Schultz, rg b,
+  emerald, Eric Smith... and probably more people I forgot. Dropped keywords
+  for some arches due new depend on sys-libs/libcap-ng (bug 284655)
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> bluez-4.39-r2.ebuild:
   Stable for HPPA (bug #284661).
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6148c7405437..709a0fe2b064 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.18/bluetooth-conf.d 257 RMD160 d3a6cd6e9fb77f6bc0c6aac4833b15c60b781c52 SHA1 c1088c509e2182a3b5987148da03393ab2053101 SHA256 73427f2c46e7be41c24e4c536107ecf8845e0125b34997d74934b92d40f79ee4
 AUX 4.18/bluetooth-init.d 1171 RMD160 6ef1d5dc53200f282ccd02aacd5ff50d78484d78 SHA1 ef39d708cf433d9ec2d8e59b1bd3729586895449 SHA256 e314970474e19b33598272c0539bb540b45fd6e65a2d1d165648f50d54308b6e
 AUX 4.18/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6831fa817c8bd2378830e13bc96d3ff3fdffa2 SHA256 8fc50b8c644e0bc69eacef2a9555118b2f4758aafcb42e8ea3ca1293e8f3a211
@@ -5,16 +8,28 @@ AUX 4.18/cups-location.patch 480 RMD160 3da74418b140c2ea05d2c9e0d743eaf004deba5d
 AUX 4.18/init.d-hidd 779 RMD160 8dc919f4d0aa2df8464e3326c14b6f5a9f0c360f SHA1 45901988313787db4f1d5a0fdc44009ffa3d650b SHA256 d5816349cc85313a8f7f1b79112918aeda863ff59f298b99462611860605c737
 AUX 4.31-as_needed.patch 1129 RMD160 16d12e4466cebbc37183c73791c957655452e17b SHA1 3f98b061f91b3875c7b7035625f1d7b22c4aa6e5 SHA256 4f59a2f1dfb4567e5d5254720ebc2dbb5cfa7bacdf962801040eb7596922d698
 AUX 4.34-conditional_libsbc.patch 1511 RMD160 c76d7515f8433e6fc73a3043b31a9ee63c5baf97 SHA1 ab58528c58cf3ce6b01758beec488035ea5ad309 SHA256 8202c8d94dc3688072a750fcf287684b1e6ee5f7ac108af604f354cc0ba97707
+AUX 4.60/bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8
+AUX 4.60/bluetooth-init.d 731 RMD160 d3415b987e5fce10ea90d93c91bbb99e47e34c5d SHA1 5ae69a8490ab6ace8625590b248fd7c7b88c45b4 SHA256 9d54bb6edd275cb670acb862ea6d9e6bf39ccb1de651a258ef9d4e983916fe8d
+AUX 4.60/cups-location.patch 311 RMD160 25260d0d4c0b28def0ca29dbe4579d582c632a06 SHA1 0e5218280082a2121c7553e79aba9cbb703c9fe0 SHA256 2240f0ce509f323f0b657049140a75fda3d83242b02546d81eeaa1bb3f7c26ec
 AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82
 AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb SHA1 0c39b4b4f4c57fb334daa793f89c0ffac046b956 SHA256 cb41a4eeea5137fb27d82d74f34e5e7dd725ddf8442c39ea623afe0d3c041fcf
 AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1 b273aac740e7c19aebc441c6c77e0ba8d32f3480 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2
 DIST bluez-4.28.tar.gz 956161 RMD160 a8add4666bc19d009132be0118d075da79e8cba2 SHA1 ff992e8665814f8af0568883fa54f9355865b82b SHA256 8a7ecc1a2ad5b8c46414b58dd3a3519f2979a320ffa7d27c88519a7cf8755493
 DIST bluez-4.38.tar.gz 996949 RMD160 5da89c2578d81058a226b780000c5fcbb20a9fbb SHA1 af443f89f2851964dc97fa99d1024f85f37b5b45 SHA256 2841deb43405a7801c819342721bb57397dac05b5d203a773ca61cc340afae4a
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
+DIST bluez-4.60.tar.gz 975104 RMD160 54502d5e4b78c47b4b2e481d7d5e674f1f1216b6 SHA1 f724d952cc23dd1b32b255b503b2b438f9cd60aa SHA256 f97d7cc270c83febcafb658ef9e98ae36b1866a01ec719a1ffd53c76fe354904
 EBUILD bluez-4.28.ebuild 4895 RMD160 42a87e25305690d3c7b3468d7f6e4285139bbe02 SHA1 c48197f5fdbd3b7703748f70a8067210fbc2ddb3 SHA256 176abebed57ea221317e1bb81741d2dca7f5af77e7715ddd28610959bf59d55f
 EBUILD bluez-4.38.ebuild 5057 RMD160 0026396a9aa7a74beaa10b84cc1da104a746bf56 SHA1 97a3a7a522516ddc4e331eace78faa901a5caaa6 SHA256 6adb9e6a9edd46775e353aab12792f81ffc92eb6de327cf150c4899765dc0e8a
 EBUILD bluez-4.39-r1.ebuild 5102 RMD160 706738db0941cd34f413de426fcfac79527707ca SHA1 58d22620bc0f900e5015a92cf184784108fde8c4 SHA256 1669607d81263dec57a5db4a31ed33978b38385641bdee5ec94bc241a5b2594e
 EBUILD bluez-4.39-r2.ebuild 5222 RMD160 56d5ac93608befbfb098f7927e06cdfb14b0cf89 SHA1 93de4b3317f88e0941885190262fb7e579bcbf57 SHA256 721366c9e1c8fecb4f269a37c703fbe645a872f585fe194c460fab81d5140240
 EBUILD bluez-4.39.ebuild 5057 RMD160 54c6c6d5f0a8c07aad48c66dc92e7978137abdb9 SHA1 a9a3720560b9831d3bccd34242aa251f116fead1 SHA256 a77d9a23c52405efc4ed7e862a519e4a0ce733c6ec7a040dd02c225859df4446
-MISC ChangeLog 3789 RMD160 16c35b87f460157a65987dad81e40b9f0ad360c2 SHA1 4ea19bd698f1660b1acdf2bd53583192a9cc2ef8 SHA256 742cbfd5ae7c847828af4a5002007dd4469385d712006da21a1347908e271508
+EBUILD bluez-4.60.ebuild 4654 RMD160 2136018cd39c19c16f415cc267e1a26dac342233 SHA1 9508655f479a13a3613457497f99bd5956b8d68d SHA256 f69807bbff024ce54cf52ab8a2acca07f1e05a6c0222b5c35fa6eaebfeed182b
+MISC ChangeLog 4273 RMD160 1dec7d9b9dc4acdcec71d271b2a70fa9b6dbf90b SHA1 e15e7b14da3120de766372ac76028ef16c481068 SHA256 ddbb5357cda3b5da0836d2ccf263235aeb7970dcb8f434b0ca1a479cc5683032
 MISC metadata.xml 695 RMD160 22c624b70b3a7cbf46877876aff36110331c6371 SHA1 0ccc35bd0904748aad03bf95560bd01c14571623 SHA256 3468c8be9e77005075bb150b5fcfb0f10ae3fa0e2775fde2a3ff259852c5f8d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktnL+4ACgkQCaWpQKGI+9RmRwCdH0Fib4bswOpPDr400iIjNoCa
++w8An2E98YrSUona+NcFVTcHohKLiVau
+=Z5ej
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.60.ebuild b/net-wireless/bluez/bluez-4.60.ebuild
new file mode 100644
index 000000000000..c4bbad7b2e00
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.60.ebuild
@@ -0,0 +1,161 @@
+# 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.60.ebuild,v 1.1 2010/02/01 19:47:45 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 ~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
+	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 )"
+
+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
+
+	# needed for both patches
+	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-conf.d b/net-wireless/bluez/files/4.60/bluetooth-conf.d
new file mode 100644
index 000000000000..b0cc744415ad
--- /dev/null
+++ b/net-wireless/bluez/files/4.60/bluetooth-conf.d
@@ -0,0 +1,7 @@
+# Bluetooth configuraton file
+
+# 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/4.60/bluetooth-init.d b/net-wireless/bluez/files/4.60/bluetooth-init.d
new file mode 100644
index 000000000000..111902aaeb55
--- /dev/null
+++ b/net-wireless/bluez/files/4.60/bluetooth-init.d
@@ -0,0 +1,31 @@
+#!/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 $
+
+depend() {
+	after coldplug
+	need dbus localmount
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	udevadm trigger --subsystem-match=bluetooth
+	eend $?
+
+	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 Bluetooth"
+	eend 0
+}
diff --git a/net-wireless/bluez/files/4.60/cups-location.patch b/net-wireless/bluez/files/4.60/cups-location.patch
new file mode 100644
index 000000000000..66ed8dc22e5b
--- /dev/null
+++ b/net-wireless/bluez/files/4.60/cups-location.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.tools b/Makefile.tools
+index d9a2425..a382e05 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -122,7 +122,7 @@ EXTRA_DIST += tools/dfubabel.1 tools/avctrl.8
+ 
+ 
+ if CUPS
+-cupsdir = $(libdir)/cups/backend
++cupsdir = `cups-config --serverbin`/backend
+ 
+ cups_PROGRAMS = cups/bluetooth
+