Fix bug 319621 and version bump.

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

4 files changed, 186 insertions, 8 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/Manifest b/net-wireless/bluez/Manifest
index f210f853cdb4..ecf1f139aef1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,7 +9,7 @@ AUX 4.18/init.d-hidd 779 RMD160 8dc919f4d0aa2df8464e3326c14b6f5a9f0c360f SHA1 45
 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/bluetooth-init.d 744 RMD160 2ba879ecc26046d64957d87f6fd67efd4b16a75f SHA1 bfee70f3491d57f5da556850260d49c06408dfa6 SHA256 bd15833f1fab747a1e90997696c49754e0b1ba121ad8017df567b35c60e2ac3a
 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
@@ -19,15 +19,17 @@ AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
 DIST bluez-4.63.tar.gz 974286 RMD160 f669a16e6bc8ec3d876a68b8e3cc8cad6a100213 SHA1 5bf786fee1fcf43a1a484b65c0dbe4a14bdca263 SHA256 53aa7b8843c609663e14bb8c66009c307d73e5400ce36b64b693c3f9fcc8b9e7
 DIST bluez-4.64.tar.gz 987567 RMD160 678f7d067074cd1e345e826e1acb2c702f24e667 SHA1 de759d9ebd8df96d38e955816e4954553366a9f1 SHA256 3007d7f802a67f9087e0c8ab0aee20c5fd7dc8ad24903a550f9b464a6876fa01
+DIST bluez-4.65.tar.gz 988997 RMD160 7dec3a0603483a721e90736be7c7f765f7dba883 SHA1 7dfe6ccf0eed4a43aec9afbc6ac6593665f5ab85 SHA256 5f0b520a2826ebdc72b4a9f6272bb36bac339e7b34292b117691345099804922
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.63.ebuild 4781 RMD160 70a4805f34b854b5a423b740b9b0c52efd372876 SHA1 666dabcd19a23eff91f1fffd046abb21cfdc9496 SHA256 7d887da76652006862a358f00fce3ca06beffe8a81e6e3e809799dbfc09fdc68
 EBUILD bluez-4.64.ebuild 4784 RMD160 5856460ae9c0ba625779a6acf7fe8c9655078c52 SHA1 05b836416deaeb5059ac31055b1d36a7cda25d7e SHA256 073a1721981c008e569f488cd0de2c52bdec20e24b68e36d450c70f4cc0ca162
-MISC ChangeLog 7082 RMD160 84d33421d6f4c15c0b3ce3015e621c9df5b93ac3 SHA1 9c887d511896ef8ef0df032ebd6d2075e886bc5f SHA256 0454fba8e53f29b6d2345c8398ecd361381e8fdd0267d9ca698b3f4bd3a1410e
+EBUILD bluez-4.65.ebuild 4783 RMD160 524fdf0d313a16b483e847d43b4ca06fa9185287 SHA1 aaebf573dbb3e06a742b50c2be9fb5e2242fe547 SHA256 3212dfb0e5321e63d8fe64e54295c389ed0819d14df597ac2891f1a284e9a078
+MISC ChangeLog 7319 RMD160 198acd9cd0e739b0711a9f4b0a2d072f3cbe6f21 SHA1 81f8841e9f099e394cead7141d4bb5e7511cd9ed SHA256 3173e8a6c3c2960fb7bfb2532702e239950218d505ffb4da89d851a3bcb43464
 MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwNU3AACgkQkKaRLQcq0GK5cQCgr1Pia2cBIKg6hRB9OemcDQGR
-Rf8AoJOQiYZyobJ0X+FP9XSBc8rSO/I1
-=5qtf
+iEYEARECAAYFAkwSDHIACgkQCaWpQKGI+9RMpQCeJcXP96xQzZK6Sx3S9FQ4+oMb
+vdIAn0dPD+MjRSskRQUqAx3zjKy8c4Qc
+=3nT+
 -----END PGP SIGNATURE-----
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