Revision bump to stop building hid2hci (bug #315749)

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

3 files changed, 182 insertions, 5 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 8e6218943aba..8b0d13392dd7 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2010/06/18 12:27:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.41 2010/06/19 16:48:49 pacho Exp $
+
+*bluez-4.66-r1 (19 Jun 2010)
+
+  19 Jun 2010; Pacho Ramos <pacho@gentoo.org> +bluez-4.66-r1.ebuild:
+  Stop building hid2hci since it's replaced by >=sys-fs/udev-146[extras]
+  provided one. This should fix bug #315749 (reported by Balazs Nemeth,
+  Marcin Kryczek and others). Thanks a lot to Bastien Nocera for the tip in
+  linux-bluetooth mailing list.
 
 *bluez-4.66 (18 Jun 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index b1fb6d890bcb..43bb447ab230 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -25,13 +25,14 @@ EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019
 EBUILD bluez-4.63.ebuild 4789 RMD160 bd67936a9ba9c3871ad89d5868c130205f068ebc SHA1 f252253b827de840d4173ed495252acbcdc927f0 SHA256 59524137be107f7b970c184f29e3f9cce25abc857c93109b95b024c97b9af2c2
 EBUILD bluez-4.64.ebuild 4796 RMD160 1b1989353a3fdfcf947a7939faa037c2db106498 SHA1 b8775bc55899bff7cb61d52a1498110fc0808286 SHA256 79f0cf2606f586da6c424318f465f94280c6750f7c83823c18516ab804783fea
 EBUILD bluez-4.65.ebuild 4796 RMD160 53e61d2ccce1785572b0b0a99fe7c929959bfa20 SHA1 2c10aabf9877e26ac299c62461b3de37036e7116 SHA256 760876d2510a1de1f8708d02817be7ded5ef52f61508e015fd91338a109fb3ed
+EBUILD bluez-4.66-r1.ebuild 4791 RMD160 858462aebec3fd101d787c51fd4eee0f18ecd366 SHA1 7e1b0fda7fc59649281c145ecd32a469c0b15e46 SHA256 2c38339f567029ea4403883ae02e4a1b6f4ed6e915192fc1b009031b3ce7ec4c
 EBUILD bluez-4.66.ebuild 4795 RMD160 e69b801a9f86f3c0556585e201ac036fd729db08 SHA1 8f99335dd5cfa60b8e3f49025140cefb3cd8844d SHA256 8532ee98b80b62bbeb7991b2bbace75e5b5cec0087367691881409fd071d1e9d
-MISC ChangeLog 7608 RMD160 e42fdd6fd7bf715c272c6f9138d3e8b54235939d SHA1 4cec2038c8697a028db0a5b80ac07fb15d09abe8 SHA256 ff271fd541e08e8c45f77dc08033048a39e45f3d7700a1256d3c917d4401c488
+MISC ChangeLog 7961 RMD160 79cb6cfebd5768e81312f33a860d39909680da34 SHA1 a8b245f8711163fefb8a92e9ab420dff68bf33b5 SHA256 031d29beac51eac9b9eed5557988a45c46412b7b99390758f7d2c5ec8eeaf019
 MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwbZhwACgkQCaWpQKGI+9SO8ACeJIfjrKEH4gPQcKSIG8ixZDh9
-HsQAn11iVjeaMoAYhz7jIbHp5hYdD4MS
-=qwAR
+iEYEARECAAYFAkwc9PkACgkQCaWpQKGI+9Sx5wCaAzpseUwpfxPWh3bwRps1W2ED
+ClgAn3Q/kueMgujDI8T7iRnKqDT/KM8E
+=S0rg
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.66-r1.ebuild b/net-wireless/bluez/bluez-4.66-r1.ebuild
new file mode 100644
index 000000000000..9bca418ff983
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.66-r1.ebuild
@@ -0,0 +1,168 @@
+# 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.66-r1.ebuild,v 1.1 2010/06/19 16:48:49 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 ~ppc ~ppc64 ~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-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
+		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-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
+}