Version bump and remove old (4.96 will be the next stable candidate if possible).

(Portage version: 2.1.10.7/cvs/Linux x86_64)

17 files changed, 19 insertions, 928 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 5a80cd5b159b..e03e946c68ba 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.99 2011/07/28 15:33:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.100 2011/08/01 09:49:02 pacho Exp $
+
+*bluez-4.96-r1 (01 Aug 2011)
+*bluez-4.96 (01 Aug 2011)
+
+  01 Aug 2011; Pacho Ramos <pacho@gentoo.org> -bluez-4.94.ebuild,
+  -files/4.18/bluetooth-conf.d, -files/4.18/conf.d-hidd, -bluez-4.95.ebuild,
+  -files/4.18/bluetooth-init.d, -files/4.18/cups-location.patch,
+  -bluez-4.95-r1.ebuild, -files/4.18/init.d-hidd, -bluez-4.95-r2.ebuild,
+  -files/4.60/bluetooth-conf.d, -bluez-4.95-r3.ebuild,
+  -files/4.60/bluetooth-init.d, -bluez-4.87.ebuild,
+  -files/bluez-4.95-high-cpu-usage.patch, +bluez-4.96.ebuild,
+  -files/4.60/cups-location.patch, +bluez-4.96-r1.ebuild:
+  Version bump and remove old (4.96 will be the next stable candidate if
+  possible).
 
 *bluez-4.95-r3 (28 Jul 2011)
 *bluez-4.95-r2 (28 Jul 2011)
diff --git a/net-wireless/bluez/bluez-4.87.ebuild b/net-wireless/bluez/bluez-4.87.ebuild
deleted file mode 100644
index dfd75988c64a..000000000000
--- a/net-wireless/bluez/bluez-4.87.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.87.ebuild,v 1.7 2011/03/21 23:00:35 maekke Exp $
-
-EAPI="3"
-
-inherit multilib eutils
-
-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="20110128" # Needed because of bug #345263
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-
-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]
-	)
-	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
-		sed -i -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
-	fi
-}
-
-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-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) \
-		--enable-udevrules \
-		--enable-configfiles \
-		$(use_enable pcmcia) \
-		$(use_enable debug) \
-		--localstatedir=/var \
-		--disable-hal
-}
-
-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 || die
-		newbin list-devices list-bluetooth-devices || die
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}" || die
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-* || die
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/4.18/conf.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
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf \
-		|| die
-
-	insinto /$(get_libdir)/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}/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
-
-	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 "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 or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if use old-daemons; then
-		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
-}
diff --git a/net-wireless/bluez/bluez-4.94.ebuild b/net-wireless/bluez/bluez-4.94.ebuild
deleted file mode 100644
index 6831baa92adc..000000000000
--- a/net-wireless/bluez/bluez-4.94.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.94.ebuild,v 1.1 2011/06/05 12:17:16 pacho Exp $
-
-EAPI="4"
-
-inherit multilib eutils
-
-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="20110605"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	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 maemo6 health old-daemons pcmcia pnat test-programs usb"
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	media-libs/libsndfile
-	sys-apps/dbus
-	>=sys-fs/udev-146[extras]
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
-	)
-	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
-	)
-	usb? ( dev-libs/libusb:1 )
-"
-DEPEND="${CDEPEND}
-	>=dev-util/pkgconfig-0.20
-	sys-devel/flex
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? ( sys-auth/consolekit )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-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
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
-	fi
-}
-
-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-tools \
-		--enable-bccmd \
-		--enable-dfutool \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
-		$(use_enable old-daemons dund) \
-		$(use_enable health) \
-		$(use_enable pnat) \
-		$(use_enable maemo6) \
-		$(use_enable cups) \
-		$(use_enable test-programs test) \
-		--enable-udevrules \
-		--enable-configfiles \
-		$(use_enable pcmcia) \
-		$(use_enable debug) \
-		--localstatedir=/var \
-		--disable-hal
-}
-
-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-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/conf.d-hidd" hidd
-		newinitd "${FILESDIR}/init.d-hidd" hidd
-		newconfd "${FILESDIR}/conf.d-dund" dund
-		newinitd "${FILESDIR}/init.d-dund" dund
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
-
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
-	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	find "${ED}" -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 old-daemons; then
-		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
-
-	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
-}
diff --git a/net-wireless/bluez/bluez-4.95-r2.ebuild b/net-wireless/bluez/bluez-4.95-r2.ebuild
deleted file mode 100644
index 0c808e90f006..000000000000
--- a/net-wireless/bluez/bluez-4.95-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95-r2.ebuild,v 1.1 2011/07/28 15:33:24 pva Exp $
-
-EAPI="4"
-
-inherit multilib eutils systemd
-
-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="20110708"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	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 maemo6 health old-daemons pcmcia pnat test-programs usb"
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	>=sys-fs/udev-146[extras]
-	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
-	)
-	usb? ( dev-libs/libusb:1 )
-"
-DEPEND="${CDEPEND}
-	>=dev-util/pkgconfig-0.20
-	sys-devel/flex
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? ( sys-auth/consolekit )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-high-cpu-usage.patch" #376677
-
-	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() {
-	econf \
-		--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 health) \
-		$(use_enable maemo6) \
-		$(use_enable old-daemons dund) \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
-		$(use_enable pcmcia) \
-		$(use_enable pnat) \
-		$(use_enable test-programs test) \
-		$(use_enable usb)
-}
-
-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-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/conf.d-hidd" hidd
-		newinitd "${FILESDIR}/init.d-hidd" hidd
-		newconfd "${FILESDIR}/conf.d-dund" dund
-		newinitd "${FILESDIR}/init.d-dund" dund
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
-
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
-	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	find "${ED}" -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 old-daemons; then
-		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
-
-	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
-}
diff --git a/net-wireless/bluez/bluez-4.95-r3.ebuild b/net-wireless/bluez/bluez-4.95-r3.ebuild
deleted file mode 100644
index 2c4b18b08f91..000000000000
--- a/net-wireless/bluez/bluez-4.95-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95-r3.ebuild,v 1.1 2011/07/28 15:33:24 pva Exp $
-
-EAPI="4"
-
-inherit multilib eutils systemd
-
-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="20110708"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	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 maemo6 health old-daemons pcmcia pnat test-programs usb"
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	>=sys-fs/udev-169
-	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
-	)
-	usb? ( dev-libs/libusb:1 )
-"
-DEPEND="${CDEPEND}
-	>=dev-util/pkgconfig-0.20
-	sys-devel/flex
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? ( sys-auth/consolekit )
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-high-cpu-usage.patch" #376677
-
-	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() {
-	econf \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-hid2hci \
-		--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 health) \
-		$(use_enable maemo6) \
-		$(use_enable old-daemons dund) \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
-		$(use_enable pcmcia) \
-		$(use_enable pnat) \
-		$(use_enable test-programs test) \
-		$(use_enable usb)
-}
-
-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-*
-
-		cd "${S}"
-	fi
-
-	if use old-daemons; then
-		newconfd "${FILESDIR}/conf.d-hidd" hidd
-		newinitd "${FILESDIR}/init.d-hidd" hidd
-		newconfd "${FILESDIR}/conf.d-dund" dund
-		newinitd "${FILESDIR}/init.d-dund" dund
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
-
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
-	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	find "${ED}" -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 old-daemons; then
-		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
-
-	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
-}
diff --git a/net-wireless/bluez/bluez-4.95-r1.ebuild b/net-wireless/bluez/bluez-4.96-r1.ebuild
index 1293560ace93..bc1f3af7cd1a 100644
--- a/net-wireless/bluez/bluez-4.95-r1.ebuild
+++ b/net-wireless/bluez/bluez-4.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95-r1.ebuild,v 1.1 2011/07/08 19:32:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96-r1.ebuild,v 1.1 2011/08/01 09:49:02 pacho Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ 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="20110708"
+OUIDATE="20110801"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
 	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/net-wireless/bluez/bluez-4.95.ebuild b/net-wireless/bluez/bluez-4.96.ebuild
index 276906e5fa19..4d03b6021997 100644
--- a/net-wireless/bluez/bluez-4.95.ebuild
+++ b/net-wireless/bluez/bluez-4.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95.ebuild,v 1.1 2011/07/08 19:32:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96.ebuild,v 1.1 2011/08/01 09:49:02 pacho Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ 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="20110708"
+OUIDATE="20110801"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
 	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/net-wireless/bluez/files/4.18/bluetooth-conf.d b/net-wireless/bluez/files/4.18/bluetooth-conf.d
deleted file mode 100644
index c84ac4f1175c..000000000000
--- a/net-wireless/bluez/files/4.18/bluetooth-conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Bluetooth configuraton file
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=false
-
-# 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.18/bluetooth-init.d b/net-wireless/bluez/files/4.18/bluetooth-init.d
deleted file mode 100644
index d66708495cf7..000000000000
--- a/net-wireless/bluez/files/4.18/bluetooth-init.d
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/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.18/bluetooth-init.d,v 1.1 2008/11/28 21:21:35 dev-zero Exp $
-
-depend() {
-	after coldplug
-	need dbus localmount
-}
-
-start() {
-   	ebegin "Starting Bluetooth"
-	local result=0
-
-	ebegin "    Starting bluetoothd"
-	# -s enables internal sdp server
-	start-stop-daemon --start \
-		--exec /usr/sbin/bluetoothd
-	result=$?
-	eend ${result}
-
-	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
-		ebegin "    Running hid2hci"
-		/usr/sbin/hid2hci --tohci -q    #be quiet
-		[ ${result} == 0 ] && result=$?
-		eend ${result}
-	fi
-
-	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
-			[ ${result} == 0 ] && result=$?
-			eend ${result}
-		else
-			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
-		fi
-	fi
-
-	eend ${result}
-}
-
-stop() {
-	ebegin "Shutting down Bluetooth"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd
-	eend $?
-}
diff --git a/net-wireless/bluez/files/4.18/conf.d-hidd b/net-wireless/bluez/files/4.18/conf.d-hidd
deleted file mode 100644
index 1677ef0f3556..000000000000
--- a/net-wireless/bluez/files/4.18/conf.d-hidd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Bluetooth hidd daemon configuraton file
-
-# Arguments to hidd
-HIDD_OPTIONS="--encrypt"
-
diff --git a/net-wireless/bluez/files/4.18/cups-location.patch b/net-wireless/bluez/files/4.18/cups-location.patch
deleted file mode 100644
index e0ddc020062b..000000000000
--- a/net-wireless/bluez/files/4.18/cups-location.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-? cups/.deps
-? cups/Makefile
-? cups/Makefile.in
-Index: cups/Makefile.am
-===================================================================
-RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v
-retrieving revision 1.9
-diff -u -r1.9 Makefile.am
---- cups/Makefile.am	20 Aug 2006 02:21:03 -0000	1.9
-+++ cups/Makefile.am	1 Jun 2007 15:47:14 -0000
-@@ -1,6 +1,6 @@
- 
- if CUPS
--cupsdir = $(libdir)/cups/backend
-+cupsdir = `cups-config --serverbin`/backend
- 
- cups_PROGRAMS = bluetooth
- else
diff --git a/net-wireless/bluez/files/4.18/init.d-hidd b/net-wireless/bluez/files/4.18/init.d-hidd
deleted file mode 100644
index 9e61281a48fe..000000000000
--- a/net-wireless/bluez/files/4.18/init.d-hidd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd,v 1.1 2008/11/28 21:21:35 dev-zero Exp $
-
-depend() {
-	need bluetooth
-}
-
-start() {
-	ebegin "Starting hidd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
-	local result="$?"
-	local service="/etc/bluetooth/input.service"
-	if [ "${result}" != "0" ] && grep -q "Autostart=true" ${service}; then
-		eerror "You have Autostart=true in ${service}."
-		eerror "Change this to false if you want to use hidd."
-	fi
-	eend ${result}
-}
-
-stop() {
-	ebegin "Stopping hidd"
-	hidd --killall
-	start-stop-daemon --stop --quiet --exec /usr/bin/hidd
-	eend $?
-}
-
diff --git a/net-wireless/bluez/files/4.60/bluetooth-conf.d b/net-wireless/bluez/files/4.60/bluetooth-conf.d
deleted file mode 100644
index b0cc744415ad..000000000000
--- a/net-wireless/bluez/files/4.60/bluetooth-conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 42f223896bb6..000000000000
--- a/net-wireless/bluez/files/4.60/bluetooth-init.d
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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.2 2010/06/11 10:14:00 pacho Exp $
-
-depend() {
-	after coldplug
-	need dbus localmount
-}
-
-start() {
-   	ebegin "Starting Bluetooth"
-
-	udevadm trigger --subsystem-match=bluetooth --action=add
-	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
deleted file mode 100644
index 66ed8dc22e5b..000000000000
--- a/net-wireless/bluez/files/4.60/cups-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
- 
diff --git a/net-wireless/bluez/files/bluez-4.95-high-cpu-usage.patch b/net-wireless/bluez/files/bluez-4.95-high-cpu-usage.patch
deleted file mode 100644
index a3029e102ef8..000000000000
--- a/net-wireless/bluez/files/bluez-4.95-high-cpu-usage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Wed, 20 Jul 2011 09:12:22 +0000 (+0300)
-Subject: Fix removing inotify watch whenever an adapter is removed
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=e2482a5ee3626e426149558e27a8e50ad07d7dad;hp=9a7e2cc81cdea7a673a2cc29cd8eae43155122c0
-
-Fix removing inotify watch whenever an adapter is removed
-
-This sometimes cause bluetoothd to burn cpu when an adapter is removed
-from the system.
-
-Since the watch is not really bond to any adapter, in fact it is added on
-plugin .init, its removal is now moved to plugin .exit.
----
-
-diff --git a/plugins/adaptername.c b/plugins/adaptername.c
-index 2a54cc0..9e99e6a 100644
---- a/plugins/adaptername.c
-+++ b/plugins/adaptername.c
-@@ -262,10 +262,6 @@ static gboolean handle_inotify_cb(GIOChannel *channel, GIOCondition cond,
- 
- static void adaptername_remove(struct btd_adapter *adapter)
- {
--	if (watch_fd >= 0)
--		close(watch_fd);
--	if (inotify != NULL)
--		g_io_channel_shutdown(inotify, FALSE, NULL);
- }
- 
- static struct btd_adapter_driver adaptername_driver = {
-@@ -314,6 +310,13 @@ static int adaptername_init(void)
- 
- static void adaptername_exit(void)
- {
-+	if (watch_fd >= 0)
-+		close(watch_fd);
-+	if (inotify != NULL) {
-+		g_io_channel_shutdown(inotify, FALSE, NULL);
-+		g_io_channel_unref(inotify);
-+	}
-+
- 	btd_unregister_adapter_driver(&adaptername_driver);
- }
- 
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index a28f245d1092..71aa61a77f79 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -14,7 +14,6 @@
 		</description>
 	</maintainer>
 	<use>
-		<flag name='attrib'>Enable attrib plugin</flag>
 		<flag name='consolekit'>Use <pkg>sys-auth/pambase[consolekit]</pkg> to
 			determine access to bluetooth devices based on whether a user is
 			logged in locally or remotely</flag>