Revert upstream commit causing problems with mouse connection (#431624 by cache), will need to recheck without reversion in bluez-5, move to python-single-r1.eclass and drop old.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 102 insertions, 263 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 8f707daaccd9..f63a8a9a269f 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.150 2012/12/11 09:44:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.151 2012/12/27 20:54:06 pacho Exp $
+
+*bluez-4.101-r5 (27 Dec 2012)
+
+  27 Dec 2012; Pacho Ramos <pacho@gentoo.org> +bluez-4.101-r5.ebuild,
+  +files/bluez-4.101-mgmt-update.patch, -bluez-4.101-r3.ebuild,
+  -bluez-4.98-r2.ebuild:
+  Revert upstream commit causing problems with mouse connection (#431624 by
+  cache), will need to recheck without reversion in bluez-5, move to python-
+  single-r1.eclass and drop old.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> bluez-4.98-r2.ebuild,
   bluez-4.99.ebuild, bluez-4.101-r3.ebuild:
diff --git a/net-wireless/bluez/bluez-4.101-r3.ebuild b/net-wireless/bluez/bluez-4.101-r5.ebuild
index 75a6fcbd3ea7..179b17d278fc 100644
--- a/net-wireless/bluez/bluez-4.101-r3.ebuild
+++ b/net-wireless/bluez/bluez-4.101-r5.ebuild
@@ -1,159 +1,144 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r3.ebuild,v 1.3 2012/12/11 09:44:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r5.ebuild,v 1.1 2012/12/27 20:54:06 pacho Exp $
 
-EAPI="4"
-PYTHON_DEPEND="test-programs? 2"
-
-inherit multilib eutils systemd python user
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils multilib python-single-r1 systemd user
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org/"
-
-# Because of oui.txt changing from time to time without noticement, we need to supply it
-# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
-# See bugs #345263 and #349473 for reference.
-OUIDATE="20120623"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="alsa +consolekit cups debug gstreamer selinux pcmcia test-programs usb readline"
+IUSE="alsa +consolekit cups debug gstreamer pcmcia readline selinux test-programs usb"
 
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.4
+CDEPEND=">=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.6
+	>=sys-apps/hwids-20121202.2
 	>=virtual/udev-171
 	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
+		media-libs/alsa-lib:=[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
+		media-libs/libsndfile:=
 	)
 	cups? ( net-print/cups )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10
 	)
+	readline? ( sys-libs/readline:= )
 	selinux? ( sec-policy/selinux-bluetooth )
 	usb? ( virtual/libusb:0 )
-	readline? ( sys-libs/readline )
 "
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
 	sys-devel/flex
+	virtual/pkgconfig
 	test-programs? ( >=dev-libs/check-0.9.6 )
 "
 RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? ( sys-auth/consolekit )
+	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
 	test-programs? (
-		dev-python/dbus-python
+		>=dev-python/dbus-python-1
 		dev-python/pygobject:2
+		${PYTHON_DEPS}
 	)
 "
 
 DOCS=( AUTHORS ChangeLog README )
 
 pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-
-	if use test-programs; then
-		python_pkg_setup
-	fi
+	use consolekit || enewgroup plugdev
+	use test-programs && python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	# Revert upstream change causing bug #431624, the problem was
+	# reported to upstream but they didn't look into it. Could be solved
+	# in bluez-5... stop the revert in that version to test then.
+	epatch -R "${FILESDIR}"/${P}-mgmt-update.patch
+
 	epatch "${FILESDIR}"/${P}-network{1,2,3,4}.patch
 
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
+	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
+	use consolekit || epatch "${FILESDIR}"/bluez-plugdev.patch
 
 	if use cups; then
 		sed -i \
 			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
+			Makefile.{in,tools} || die
 	fi
 }
 
 src_configure() {
-	use readline || export ac_cv_header_readline_readline_h=no
+	export ac_cv_header_readline_readline_h=$(usex readline)
 
+	# Missing flags: --enable-{sap,hidd,pand,dund,dbusoob,gatt}
+	# Keep this in ./configure --help order!
 	econf \
-		--disable-silent-rules \
-		--enable-hid2hci \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-input \
+		--localstatedir=/var \
 		--enable-network \
 		--enable-serial \
+		--enable-input \
+		--enable-audio \
 		--enable-service \
-		--enable-tools \
-		--disable-hal \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)" \
-		$(use_enable alsa) \
-		$(use_enable cups) \
-		$(use_enable debug) \
+		--enable-health \
+		--enable-pnat \
 		$(use_enable gstreamer) \
+		$(use_enable alsa) \
+		$(use_enable usb) \
+		--enable-tools \
+		--enable-bccmd \
 		$(use_enable pcmcia) \
+		--enable-hid2hci \
+		--enable-dfutool \
+		$(use_enable cups) \
 		$(use_enable test-programs test) \
-		$(use_enable usb) \
-		--enable-health \
+		--enable-datafiles \
+		$(use_enable debug) \
 		--enable-maemo6 \
-		--enable-pnat \
-		--enable-wiimote
+		--enable-wiimote \
+		--disable-hal \
+		--with-ouifile=/usr/share/misc/oui.txt \
+		--with-systemdunitdir="$(systemd_get_unitdir)"
 }
 
 src_install() {
 	default
 
-	if use test-programs ; then
-		cd "${S}/test"
+	if use test-programs; then
+		pushd test >/dev/null
 		dobin simple-agent simple-service monitor-bluetooth
 		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die # bug #356529
-		for b in hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
+		rm test-textfile.{c,o} || die #356529
+		local b
+		for b in hsmicro hsplay test-*; do
+			newbin "${b}" bluez-"${b}"
 		done
 		insinto /usr/share/doc/${PF}/test-services
 		doins service-*
-
-		python_convert_shebangs -r 2 "${ED}"
-		cd "${S}"
+		python_fix_shebang "${ED}"
+		popd >/dev/null
 	fi
 
 	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
+	local d
+	for d in input audio network serial; do
+		doins ${d}/${d}.conf
+	done
 
-	newinitd "${FILESDIR}/bluetooth-init.d-r2" bluetooth
-	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
-	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
+	newinitd "${FILESDIR}"/bluetooth-init.d-r2 bluetooth
+	newinitd "${FILESDIR}"/rfcomm-init.d rfcomm
+	newconfd "${FILESDIR}"/rfcomm-conf.d rfcomm
 
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	prune_libtool_files --all
+	prune_libtool_files --modules
 }
 
 pkg_postinst() {
 	udevadm control --reload-rules
 
-	if ! has_version "net-dialup/ppp"; then
-		elog "To use dial up networking you must install net-dialup/ppp."
-	fi
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
 
 	if use consolekit; then
 		elog "If you want to use rfcomm as a normal user, you need to add the user"
@@ -165,7 +150,7 @@ pkg_postinst() {
 		elog "to add the user to the plugdev group."
 	fi
 
-	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
+	if [ "$(rc-config list default | grep bluetooth)" = "" ]; then
 		elog "You will need to add bluetooth service to default runlevel"
 		elog "for getting your devices detected. For that please run:"
 		elog "'rc-update add bluetooth default'"
diff --git a/net-wireless/bluez/bluez-4.98-r2.ebuild b/net-wireless/bluez/bluez-4.98-r2.ebuild
deleted file mode 100644
index 3cc974896c3f..000000000000
--- a/net-wireless/bluez/bluez-4.98-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.98-r2.ebuild,v 1.12 2012/12/11 09:44:00 ssuominen Exp $
-
-EAPI="4"
-PYTHON_DEPEND="test-programs? 2"
-
-inherit multilib eutils systemd python user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-
-# Because of oui.txt changing from time to time without noticement, we need to supply it
-# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
-# See bugs #345263 and #349473 for reference.
-OUIDATE="20120113"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa caps +consolekit cups debug gstreamer pcmcia selinux test-programs usb readline"
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	~virtual/udev-171
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
-	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
-	cups? ( net-print/cups )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	selinux? ( sec-policy/selinux-bluetooth )
-	usb? ( virtual/libusb:1 )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? (
-		|| ( sys-auth/consolekit
-			>=sys-apps/systemd-37 )
-	)
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-
-	if use test-programs; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Fix compilation problems against bluez, bug #403341
-	epatch "${FILESDIR}/${PN}-4.98-fix-header.patch"
-
-	# Fix needing to enable socket, bug #401065
-	epatch "${FILESDIR}/${PN}-4.98-fix-socket.patch"
-
-	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() {
-	use readline || export ac_cv_header_readline_readline_h=no
-
-	econf \
-		--enable-hid2hci \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-input \
-		--enable-network \
-		--enable-serial \
-		--enable-service \
-		--enable-tools \
-		--disable-hal \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)" \
-		$(use_enable alsa) \
-		$(use_enable caps capng) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable gstreamer) \
-		$(use_enable pcmcia) \
-		$(use_enable test-programs test) \
-		$(use_enable usb) \
-		--enable-health \
-		--enable-maemo6 \
-		--enable-pnat \
-		--enable-wiimote
-}
-
-src_install() {
-	default
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die # bug #356529
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		python_convert_shebangs -r 2 "${ED}"
-		cd "${S}"
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth
-	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
-	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
-
-	if ! has_version "net-dialup/ppp"; then
-		elog "To use dial up networking you must install net-dialup/ppp."
-	fi
-
-	if use consolekit; then
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		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 [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
-		elog "You will need to add bluetooth service to default runlevel"
-		elog "for getting your devices detected from startup without needing"
-		elog "to reconnect them. For that please run:"
-		elog "'rc-update add bluetooth default'"
-	fi
-}
diff --git a/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch b/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
new file mode 100644
index 000000000000..c7523e6a2ff6
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
@@ -0,0 +1,27 @@
+From d22d083d6dd681f8d25eb806d4ec91853475ee06 Mon Sep 17 00:00:00 2001
+From: Gustavo Padovan <gustavo@padovan.org>
+Date: Thu, 5 Apr 2012 16:22:55 -0300
+Subject: [PATCH] mgmt: update mgmt control channel id
+
+kernel side has updated its control channel id from 1 to 3.
+---
+ lib/hci.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/hci.h b/lib/hci.h
+index 887a860..f7be92d 100644
+--- a/lib/hci.h
++++ b/lib/hci.h
+@@ -2288,8 +2288,8 @@ struct sockaddr_hci {
+ #define HCI_DEV_NONE	0xffff
+ 
+ #define HCI_CHANNEL_RAW		0
+-#define HCI_CHANNEL_CONTROL	1
+ #define HCI_CHANNEL_MONITOR	2
++#define HCI_CHANNEL_CONTROL	3
+ 
+ struct hci_filter {
+ 	uint32_t type_mask;
+-- 
+1.7.6.5
+