Version bump fixing lots of bugs and trying to behave better with oui.txt (thanks to Thomas Kahle and Zac Medico for their help with this). Remove old.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 17 insertions, 368 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 112154d71e26..bca2412a312e 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,13 @@
 # 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.68 2011/01/23 09:14:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.69 2011/01/28 10:30:30 pacho Exp $
+
+*bluez-4.87 (28 Jan 2011)
+
+  28 Jan 2011; Pacho Ramos <pacho@gentoo.org> -bluez-4.75.ebuild,
+  -bluez-4.77.ebuild, -bluez-4.81.ebuild, +bluez-4.87.ebuild:
+  Version bump fixing lots of bugs and trying to behave better with oui.txt
+  (thanks to Thomas Kahle and Zac Medico for their help with this). Remove old.
 
   23 Jan 2011; Thomas Kahle <tomka@gentoo.org> bluez-4.80.ebuild:
   x86 stable per bug 349473
diff --git a/net-wireless/bluez/bluez-4.75.ebuild b/net-wireless/bluez/bluez-4.75.ebuild
deleted file mode 100644
index dfb05daad3db..000000000000
--- a/net-wireless/bluez/bluez-4.75.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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.75.ebuild,v 1.5 2010/11/05 12:04:37 fauli Exp $
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	http://standards.ieee.org/regauth/oui/oui.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
-		epatch "${FILESDIR}/4.60/cups-location.patch"
-	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-netlink \
-		--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
-		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}/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 /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}/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
-	doins "${DISTDIR}/oui.txt" || die
-}
-
-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.77.ebuild b/net-wireless/bluez/bluez-4.77.ebuild
deleted file mode 100644
index 5172ae1aa9a9..000000000000
--- a/net-wireless/bluez/bluez-4.77.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.77.ebuild,v 1.1 2010/10/31 11:23:38 pacho Exp $
-
-EAPI="3"
-
-inherit multilib eutils
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
-	http://standards.ieee.org/regauth/oui/oui.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
-		epatch "${FILESDIR}/4.60/cups-location.patch"
-	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="${ED}" 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 /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}/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
-	doins "${DISTDIR}/oui.txt" || die
-}
-
-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.81.ebuild b/net-wireless/bluez/bluez-4.87.ebuild
index 964b4a3c2037..3c664a6b105e 100644
--- a/net-wireless/bluez/bluez-4.81.ebuild
+++ b/net-wireless/bluez/bluez-4.87.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.81.ebuild,v 1.1 2010/12/10 19:51:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.87.ebuild,v 1.1 2011/01/28 10:30:30 pacho Exp $
 
 EAPI="3"
 
@@ -9,9 +9,12 @@ inherit multilib eutils
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org/"
 
-OUIDATE="20101210" # Needed because of bug #345263
+# 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://standards.ieee.org/regauth/oui/oui.txt -> oui-${OUIDATE}.txt"
+	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
@@ -93,7 +96,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README || die
 
@@ -125,7 +128,7 @@ src_install() {
 		serial/serial.conf \
 		|| die
 
-	insinto /etc/udev/rules.d/
+	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