Version bump and fix bug #283057

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

8 files changed, 95 insertions, 361 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 5216d0d714b4..514b9ecebc5f 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,16 @@
 # 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.48 2010/09/06 14:04:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.49 2010/09/07 11:00:27 pacho Exp $
+
+*bluez-4.70 (07 Sep 2010)
+
+  07 Sep 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.63.ebuild,
+  -bluez-4.64.ebuild, -bluez-4.67.ebuild, +bluez-4.70.ebuild,
+  +files/bluetooth-init.d, +files/init.d-hidd, metadata.xml:
+  Version bump with updated init.d scripts to make them POSIX compliant
+  (following Michał Górny suggestions in bug #283057), two new USE flags
+  for compiling plugins and some upstream bugfixes that allow us to drop old
+  alsa location patch. Remove old.
 
   06 Sep 2010; Christian Faulhammer <fauli@gentoo.org> bluez-4.69.ebuild:
   stable x86, bug 335317
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index eced85aa8712..e020644de213 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,29 +11,27 @@ AUX 4.34-conditional_libsbc.patch 1511 RMD160 c76d7515f8433e6fc73a3043b31a9ee63c
 AUX 4.60/bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8
 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 bluetooth-init.d 758 RMD160 eadf94d4c911a19b2031504437465f89c5665192 SHA1 cd7b908dea49bbe0b7cb98662ec9101979905900 SHA256 c80aee8e7ef6973dfdd45130dc1a6dcbc8af917080a2e4a2d71e272c74090922
 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
 AUX bluez-4.62-makefile_ipctest.patch 1296 RMD160 19fb0c31b0981b81ea7ac9cca4780e3f93d0d870 SHA1 ce9f7f582176472cf08890ba0ac9de8187ecea57 SHA256 176c61b760fe57860d2190319854ac056850a56bc0d58c206b2be697224978ab
 AUX bluez-alsa_location.patch 539 RMD160 d4ecae8267e78d0e81a38d8ba72a8311c724a7e9 SHA1 9422e3c95fdc5e46d714d00563fcd016da6b2f24 SHA256 85d21fdd51bffb29cc45e0ab5050dd7d85ed8fa652551789bb7f5c48d7f77b44
 AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1 b273aac740e7c19aebc441c6c77e0ba8d32f3480 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2
+AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 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.66.tar.gz 990368 RMD160 9b69117652f42e1619ee18dde6801b1297e4803a SHA1 557eed51d542d95f9d5b3d7d58142c045ea4c3b1 SHA256 c223cbb80df0b1f17f6ef4efd0be1fe35ae640bd979f852cfbcc452abc0a7ea5
-DIST bluez-4.67.tar.gz 995252 RMD160 5303ac10dfcc8e67f25f841968d50865a0778ef7 SHA1 d6ca00e67f71cdb47e5d55fafdb5f76b7909d18c SHA256 aa58c6a9462ae08a7c440fad204fd2fe9f428159bd924a5a9160084506169f3a
 DIST bluez-4.69.tar.gz 997733 RMD160 03be499fdb5064e0ec1440eddbcc452f5448566a SHA1 488a70627dd40d8a138477d5363ff1444bce77bd SHA256 10e67a9349bbd7aecc177631c2703e9bd346dffe10a4b70b058c3a1da8b98ec0
+DIST bluez-4.70.tar.gz 1030033 RMD160 5cdcb21294812cbcd482b6ce00ee7392735fab26 SHA1 0922b9e3d14def6c7f38afee163be629696fe640 SHA256 b18f5125f462c7fb6450cad346380a4ddf464adcc80aabfce5a041b56864b4b9
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
-EBUILD bluez-4.63.ebuild 4789 RMD160 bd67936a9ba9c3871ad89d5868c130205f068ebc SHA1 f252253b827de840d4173ed495252acbcdc927f0 SHA256 59524137be107f7b970c184f29e3f9cce25abc857c93109b95b024c97b9af2c2
-EBUILD bluez-4.64.ebuild 4796 RMD160 7e41eeaca33c5843b2ff0db9257b174af1dc644a SHA1 da17b6f18db9b1c6c4645b72eeb3ba88f9c6ba73 SHA256 4eb691a27e868de8079f681e0339459985f4c5d367060915c623cfa4b75bd46b
 EBUILD bluez-4.66-r1.ebuild 4789 RMD160 f198caaf7d2144cf157f37e82e62cfc4b7f0f4fb SHA1 53092b78b4e18f1c4dfee0f29148a9b629a3cab5 SHA256 8c45158dff629052868c5755776bbda4924d760c433ee739c02678838445555b
-EBUILD bluez-4.67.ebuild 4788 RMD160 e650acf8a721f53b83e550ef6ea366f67e01840a SHA1 b74f9bb8ff8ac9bef3efb9ac648fe961e03ebcc2 SHA256 ed648d0e37b2501344314b6d4c352c2c751bd9db10a3840e2cd645d2ee9806a5
 EBUILD bluez-4.69.ebuild 4868 RMD160 0c8418d1d3bd9be21ed8140b81f9398606547a18 SHA1 8e5a5b13062d46050b17d7df6b8fe430d2c3d255 SHA256 d5869e7524a9ad46381abbe9690887ce956cdc81da524c03915053b4d062cffb
-MISC ChangeLog 9052 RMD160 378a4b731c98f1bda019fec2f48ac27f8d45f11c SHA1 cf7ee4413e02b43219e0cbb3aec324521ca1aca9 SHA256 dd393d04fe6c15fd60474064711bcf6c9f5087b8a76775085af557b718455eb4
-MISC metadata.xml 890 RMD160 001ee34c47cf4829dedd9fec1d451b48f9afdf11 SHA1 7961014b2287a2fd6b12cb1beca7f70c5c84319d SHA256 9e84622222a2ed5c4cec2a8e2cd254cf8d8b44031c9479374c18c03c24a5d720
+EBUILD bluez-4.70.ebuild 4819 RMD160 9a49a301aa217909bc215e75f649b6e9a4d989ea SHA1 3634cb48b2ccdfc30d92d4eda8347efc8d26f9c0 SHA256 358a86e09e122892a540d0dae62dc74df4fad1b1c96c1aee98ea72047330b601
+MISC ChangeLog 9528 RMD160 1a45b83724a9730b1a7416e88ac7518e91c673be SHA1 c11e1c26147bea609f739d08e52a4d6eba7c4d4f SHA256 5571287d0918e86514707cd602f67a1d4d655677730fb51a73eb434449d573ff
+MISC metadata.xml 986 RMD160 8c5e2d92dd8046c85e83daaf9dc2ec29d4d98e52 SHA1 8e5c9fc52525b846c6bc3472b4eaa60843fc9449 SHA256 bdf3bcfd2882f90b13399369a4fc92ff76bf113ec46ca055023216aacfb282f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyE9PUACgkQNQqtfCuFneNyoQCbBvNcXqPyP41WGwYhBmF6n8MW
-/egAoI+xzpTgTEkPgndTB0xpuNigJ9wM
-=WOWm
+iEYEARECAAYFAkyGG1IACgkQCaWpQKGI+9QtCwCeM5nOu5hbWiGFTXm1KzK/OIqA
+Ow8AnRal+sME+ISAVj1T5JC44lvAl+E4
+=xjeW
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.63.ebuild b/net-wireless/bluez/bluez-4.63.ebuild
deleted file mode 100644
index 2d35a384d34b..000000000000
--- a/net-wireless/bluez/bluez-4.63.ebuild
+++ /dev/null
@@ -1,169 +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.63.ebuild,v 1.5 2010/06/11 22:25:13 josejx 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 ~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
-	>=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/bluez-4.64.ebuild b/net-wireless/bluez/bluez-4.64.ebuild
deleted file mode 100644
index 62a1729e5812..000000000000
--- a/net-wireless/bluez/bluez-4.64.ebuild
+++ /dev/null
@@ -1,169 +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.64.ebuild,v 1.4 2010/06/24 01:17:33 angelos 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
-	>=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/bluez-4.67.ebuild b/net-wireless/bluez/bluez-4.70.ebuild
index 28d69a8e635a..25ee6db35cfe 100644
--- a/net-wireless/bluez/bluez-4.67.ebuild
+++ b/net-wireless/bluez/bluez-4.70.ebuild
@@ -1,10 +1,10 @@
 # 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.67.ebuild,v 1.1 2010/07/06 10:02:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.70.ebuild,v 1.1 2010/09/07 11:00:27 pacho Exp $
 
 EAPI="2"
 
-inherit autotools multilib eutils
+inherit multilib eutils
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -13,7 +13,7 @@ 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"
+IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 old-daemons pcmcia pnat test-programs usb"
 
 CDEPEND="alsa? (
 		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
@@ -55,11 +55,6 @@ src_prepare() {
 	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() {
@@ -80,6 +75,9 @@ src_configure() {
 		$(use_enable old-daemons hidd) \
 		$(use_enable old-daemons pand) \
 		$(use_enable old-daemons dund) \
+		$(use_enable attrib) \
+		$(use_enable pnat) \
+		$(use_enable maemo6) \
 		$(use_enable cups) \
 		$(use_enable test-programs test) \
 		--enable-udevrules \
@@ -109,7 +107,7 @@ src_install() {
 
 	if use old-daemons; then
 		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
-		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
+		newinitd "${FILESDIR}/init.d-hidd" hidd || die
 	fi
 
 	insinto /etc/bluetooth
@@ -125,7 +123,7 @@ src_install() {
 	exeinto /$(get_libdir)/udev/
 	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
 
-	newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die
+	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth || die
 	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
 }
 
@@ -154,7 +152,8 @@ pkg_postinst() {
 		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."
+		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
diff --git a/net-wireless/bluez/files/bluetooth-init.d b/net-wireless/bluez/files/bluetooth-init.d
new file mode 100644
index 000000000000..6e19ffb0d03f
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-init.d
@@ -0,0 +1,33 @@
+#!/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/bluetooth-init.d,v 1.1 2010/09/07 11:00:27 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
+			eindent
+			ebegin "Starting rfcomm"
+			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
+			eoutdent
+			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/init.d-hidd b/net-wireless/bluez/files/init.d-hidd
new file mode 100644
index 000000000000..39399a9184b3
--- /dev/null
+++ b/net-wireless/bluez/files/init.d-hidd
@@ -0,0 +1,30 @@
+#!/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/init.d-hidd,v 1.1 2010/09/07 11:00:27 pacho Exp $
+
+depend() {
+	need bluetooth
+}
+
+start() {
+	local result service
+
+	ebegin "Starting hidd"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
+	result="$?"
+	service="/etc/bluetooth/input.service"
+	if [ ${result} -ne 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/metadata.xml b/net-wireless/bluez/metadata.xml
index 638ca7dee510..bb41c85199e5 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -14,12 +14,14 @@
 		</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>
 		<flag name='maemo6'>Compile with maemo6 plugin</flag>
 		<flag name='old-daemons'>Install old daemons like hidd and sdpd that are
 			deprecated by the new Service framework</flag>
+		<flag name='pnat'>Enable pnat plugin</flag>
 		<flag name='test-programs'>Install tools for testing of
 			various Bluetooth functions</flag>
 	</use>