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.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 108 insertions, 276 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/Manifest b/net-wireless/bluez/Manifest
index 7031b6852244..aecb6a1f0dd1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,6 +5,7 @@ AUX bluetooth-conf.d 181 SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e
 AUX bluetooth-init.d 767 SHA256 38efb9dffaab70477f7525dd6657dffc725c61e29c05b0649e95c31f589b31ce SHA512 bb6d9f96d5ad6658d9a0840d81979b95827c74b3f387696ad8534bb70261eafb2c3a34cfcb5fc74bd716b9083b5ea206362130c54b858d3b91471d03594978cd WHIRLPOOL 6f0c6dd05afc15be5f9cf14de69107237d2dc20c1d5c05e0430350de5e7d262b33d36cfe6556aacb2a780339a71db282bd9a92e01312e21fab1342839de893a5
 AUX bluetooth-init.d-r1 454 SHA256 04de6c5bd2d2c702b0e27d7b379a284643cf2f5a03f3c5e3eaf1ac728d47b886 SHA512 2be96edb29506d4a78a2f995ce816b4b3f8ca57ff1b8bd12f1b00a0fa30510758e35a1b8f305e5e8d7c3b059aa807785f8559ec5e3fa41628cc80f07c0a759ca WHIRLPOOL d21ad0696dae9980ccdeb2820c5a7b853494d82e08ac672ce62e2b7787f95e47ec16d8b0270039e2f4d0f4ad8dc0b3ca8aeee3e43b01a3ae61c690c098ac5ae6
 AUX bluetooth-init.d-r2 532 SHA256 cd8cc3763601470328709c961b0c68a311f6d4af302d46a880fb855ed9d04efe SHA512 a1a391ac545d69aa15a1f98349e68b06b3468759acef95ea82d7cdec58ba40c3d03bda87e0279d186440c84ea940ae09d075269f6cb6b27cf2ca1f2a329e842b WHIRLPOOL ae6b78b8f8d56a567a2d80693366ebc319447267345db373e3b01dcf2c58078cf1615529589f3c3fb1237f7c617583639f3ae501018d11a8eaf68186938bddd2
+AUX bluez-4.101-mgmt-update.patch 694 SHA256 b5312be11204fed9dd7eb4c3e81bc89506680336c31fa09fe3a0d8c912aa96ae SHA512 c313c39258a8571a76405b1b599f8d58ba5baf079288bbab0de1c9f4d1b8b643251049252c2b042839f559a20e9ed561bfe283f3726cd7cf3af56b57f632fe25 WHIRLPOOL a020a3fce6682c1517c8a2548c509c76efdd5b4df0f46648117bb8bb727a7d93fc186bdcc171b85cd27202dc5d0c9761860e0ee431351dfc831a392bf88181e9
 AUX bluez-4.101-network1.patch 1804 SHA256 3f4fe91ad4b30ccaf99290daffee5b6ef567252778c947a76a94814cd428e83b SHA512 6cbefa921a6aa8fde48171f6163c30289d0c069f3418207c52e9652e07bae19b8437534dcbf559c9564cab17af71db94424f49c49049df4a5ade714090117a5d WHIRLPOOL d9a42216dfa59b7916d9d045481e4dc9427a663c4306ff866f62af8cecaf3bea04960049bf3b5834fdc847241c1725b9fa6d2a13f521eb2e41b64d364ca895f0
 AUX bluez-4.101-network2.patch 813 SHA256 48a50ce8249f80cb8c47df6006d80e9a0ad84be7d2db34a29152e909118d44c2 SHA512 1d4689d57b48cacc0ef706683ebb6699b816bc70973e18c282efae45beb41b138f96e28b9e1c8732fa488d4b2502640abc35ba73d9581762cbce58b0efa588a1 WHIRLPOOL d3c527ca8613aa93bc82184f3dd751ec69b7354bd103fce50337b51502c851a7fb780f19cbc1d5cfa79b169847def7ee63dc523e9d10774eaa4f7028a45e01c4
 AUX bluez-4.101-network3.patch 877 SHA256 2b7ca0ac1bde85ff2fc627c2f89b2b65aaa33c4faad94179f6e852abfba76fb8 SHA512 4aa9e742e6063b8cb4130b13b398db03d4d75f7a184cd4182e32c4e6853a517ad051cc1a051e61c0bb1ee8d3d46a67c5d63d79447a4ee08da82e9ad924cf0b9b WHIRLPOOL 370aacea58edd65d0e766c71169515ec955dc8e2faaf9f9c4e1e299d847a8ed03bcd9d77345c53c1f93d18d194f6c5ea3a47b27b7eccb49c34774dc18aefdd94
@@ -22,25 +23,17 @@ AUX init.d-hidd 780 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b
 AUX rfcomm-conf.d 150 SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 SHA512 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb WHIRLPOOL 4d8b1f17c87120fcc21eb49644b27813a9463d990d3533cd542710cd14981cb74528b978ca65001fa60153e05260a0ee0a7af1d2855b04484ec1f7318acda8f0
 AUX rfcomm-init.d 668 SHA256 4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e SHA512 8f14b4e05c9ecaf4586ed2fdc2d2519de6b613de62ae5c95508baa682630f3112c5b6db6850f76679afc49e06f2ad035d148fa30b9b980747b6fb423f7bebe88 WHIRLPOOL 59859206a2b21580b92e747f06188ec362b41e1b7aa988de86e133ed8ea619f1166547231b9851c2dbd9298c84a1f33d39bc08932cad403087b123d370332236
 DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196
-DIST bluez-4.98.tar.xz 838868 SHA256 6eb21e712e8835eb1aec84bdfb38891cc4dc5353af921b8235d481da13c565d9 SHA512 c5311390af6adc7ff98a79cb59100722f80d9c264f8ff899ef1796221f65cbb639a90d2ddadb03422fb62cc9bae579a6565314506bb9e4a581987561105b0679 WHIRLPOOL 2e54f2aaca8f120821799cdd57ad37438d8d50fc484269b73dac798de87393ed54700351274a3c6446a5e69b07f4d0cc2b69429f1dae9ad60bd27e68bc836f9b
 DIST bluez-4.99.tar.xz 859756 SHA256 41889a91a5516eec26c4e59095ceea076de158b1ac38fd0ede9034596f511d3b SHA512 79e36a65ff9ff9c3311a8ef4819692503bb02f048a3c42dd0b9512749fb8e4d810eb832f211fb7dfebc7b6b5bf82a9363edd15741d62595f36d782804bb39ac3 WHIRLPOOL 32b8e3f67c846a17e7335395021008c181a2645fdb08b4ebe36bf4ad5221eef00f86ec7ef0d1de19c64741c884376666677ca9e129868dcaa18a5d4c0737c894
-DIST oui-20120113.txt.xz 541268 SHA256 f65d2096566d88f9c55ce4da9104696cecb262a7d07c2f2ff58332f1ab40ae84 SHA512 b72189f9a49041390d3d5f72c96c604fb801908a6b1f501d9476f0e026ac5196d71097b313030d2af6486b5c9700c01900c087cb75c6fe2a58f27b279044b64f WHIRLPOOL e01f2aafef0ccbeece35ae82321aabd54e6ce003fd8d3f357ee8e2a499e54c4004f93b250b20e28285131fd2516674a0e89c98a29763d2bd5c1de7486cdd962d
 DIST oui-20120308.txt.xz 546720 SHA256 4256ba96a522333a41fd058e1880a04f77566c9ad0a62d3c0d7ac422bf8b9086 SHA512 f749b3ce9b6173760319849f1e4699f02d4f8628de78d0bc39c08b01331567b60a9bd3303a84982ad23bc6cbe7b6d9f27e2e26f699a818dac0e0e8fa6ddb44fa WHIRLPOOL 0797457e3bb54d49b295547a47894258c2c5a9954ca87c44948bdb57781e11c84d2d1be9cf6d3deb0d062e4a98b0b1fb406a1f0fbeb9d0a294da624c2e90f9ee
-DIST oui-20120623.txt.xz 561880 SHA256 94843e51cf957a2da36869e0df1ff95c929694e9624e18416dfbfd10eb0af4e6 SHA512 ca87986c9c9f489ec0ba4f5bcb35260caf3a0b121c1433d57e9f8d564d8775def7215f90de63a7464ed57ce284c7b850451d69712ed151c1965ea3a9bccdfabe WHIRLPOOL 55c8484a723b6ce0e0166a798650c3cf630fda007aadaddb727605306b412cb420a6bb2aef13d3bb05affbda6b98725955706b4f998e6d22d45e4c6074f57421
-EBUILD bluez-4.101-r3.ebuild 4530 SHA256 0b94a6e29ef6f943ec0ac7d7d09293542d8087ffdd6c81f412908dba44c89de0 SHA512 7be674988690433e5530f90daa306d5b990066b3482bbd1ab680dc904bf993f5aeabb7dc600e3b75487979c03d63e73390919a83f25ea004d1d0464a42d8b236 WHIRLPOOL 93984088afcedf8f8e7b215ebb1f7b7cda3a02b1db46f7d68c8abf2a392213f048a4a50934e8a8a6be1fcff8d5bc5a7a243bf271a63addffe7403152676374ba
 EBUILD bluez-4.101-r4.ebuild 4146 SHA256 b83da242f65d92800c0e91957201254bc602e53d4f9c4fa6eeb56f16801f1c10 SHA512 0f122fb082d01ca7bc5a543cc1d3f1ccf3aee813f05c98cbbc6c64b9f3a2ed2cde1c2c3855092b21200a4a7bc5d37596efeece4fe98341fb2d1c83c1b2af3c87 WHIRLPOOL 533d8e94a6833d8f002da774933c00390d6d121271eff212d885994e4e7a0e734ef7061cf82df0f87093570408714fa330c9e32aa58473ab2073737712e6d278
-EBUILD bluez-4.98-r2.ebuild 4866 SHA256 488337cd4ea35290a067f1b4466c8a82a63fac4ee5be774884cf9adf76521e93 SHA512 e422730fd84d62599517ebc0df9781896bdd078c6c8e015391466532c74ccdb4902355cb9f4591632f007d7b57cd11bfc79d939a9c2c02f75aadb4612e184b57 WHIRLPOOL 55cc7eb5a7efddaa364e7f4b94b2b773added5cb6812c700503c169dbe4883a352e53e5693d11c0602101127716ba796c5751ac368c347a5f16405fff21b2207
+EBUILD bluez-4.101-r5.ebuild 4421 SHA256 31881ed6b9d4ac25cfccc3bd973b899bf8473861cfe55896ebc5c7e9804032cf SHA512 6a0737d7fe2e5047e42e4a73c6427af660a4803be18fe003da73bf567b594311d5ba1988b3658ccc9b450230a349608e67aa5759513cf524db4b903ef77aad17 WHIRLPOOL 278634b0ff741b87030ad3c1dbea56f1a8f4216e1f540414c58767c2e32b5d6433503e89d6f4627421e9201f07bb3811403ee87bf93406558c185cb62d8d5098
 EBUILD bluez-4.99.ebuild 4661 SHA256 8c4044a484128d8633bfd5307addc77a4dc140204913c661438a62d0d5e290c0 SHA512 27950e85dd38c415e0cfd6d4293c4829636091f0c1075835d7d36ea1a1f2a3a441dd29560db930c6dc5d58102dc45ccf49423d15213cdeee12db3a8105bffdd6 WHIRLPOOL 8cf0fa231fe1d141067cb19d27607e4a5e524305cffc5dc431d2307eae999aaf6773754d4c1f29e144dd914ae161a13f0cec1aeb5094cb4878cc603a5b6c5c50
-MISC ChangeLog 29096 SHA256 3eb5eeee17e9db87cfa19721de68ba4c60742f67509fdec8308d41919091caf2 SHA512 59ec6db3ff67af54b4f84554f17745adb02fc7f0f55663fa99f4fc09e9d6e4592f7b43da5fafb05c9faea7fd390090f1a2c645eedc457ea40b61752988d04627 WHIRLPOOL 199394e50801a4e0eb4d507986b0e789bae378557763699022e636aba4770a9bac28ff9a0d01845ebf32f4eda43cc0d4c3af52a047af8ffcf743dfd269b158b7
+MISC ChangeLog 29469 SHA256 20ddb4e5eed50212e864c1c4d246fcf80914c62dfc31c5a8b00efbfb6466d84d SHA512 9fb51f2fe70a1f8612b77b00e511c48d309304b88d9c24d769b2b841cbb41d4c6d2d95fd2fe5cec9aff1af950a266bdcc4328d688ba8e119dd78c60dda581010 WHIRLPOOL cf3c7a77ea9d0804b000bd0041151388afebb6f6fe691f0c82cc1038f59d539320c2a3908d95b824df5ec9017fd3f28a6d697cb75e7dd467ae3f2403dbdb5a34
 MISC metadata.xml 521 SHA256 9cc62ed8d580418de94c3bc46ea23be98a920868bf9adf8a9151070eeb727610 SHA512 b4ed13560b952505b6962e875dfd504dba4ec707854d5bf9098e9fb3da759c708b14fae347a647e17b03130f2fbfe2893cd181cf0353cf1ca3cc597603fd31f7 WHIRLPOOL 9cb4468618d125258274e731f800cf784fb356d51e38f7c5960d0ad4c2b38a113e4a43864766aeaeef3131b952667ece0ea82f168baa6f4f7343d374826c254b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxwBiAAoJEEdUh39IaPFNzH4IAI36zT8gWU+UG015wxaWrQqm
-a9aIxHr6xtt/KCg45wO3Q0kzkxHB8Seb+4BbYoYdN0jmtRaATBPVvtIlRAaI8mi+
-erAwH2wcbN/2ZbFa4ZdocTcMlboH36HSJ8SKrQaLsczQWDbmhXb3NskNcxLiEpVQ
-eR7nJQO72VPF7QHTQszgWz/CUkC22kKyHaFDDwuXoaZPHx1z4LacgMswATZeLGpA
-HseqjI+vBsDvMQ6IGjyCX9HX9O4h/mX549cUqMcvnr+Aepu0oKNqu9gaMRVCoASS
-SJ7ZttPPREYv9wpdBoJXzlZcqTeToXHctGV0qWZvoD5cHixBIx7HmA/c2P6SJnc=
-=tjdy
+iEYEAREIAAYFAlDctW8ACgkQCaWpQKGI+9TeYACaAmxMQ9fe7UGTuXnhCQoHAeOv
+pw8AmwV3lgIvEelE9NecfsHe3ed+EZgR
+=z+Vc
 -----END PGP SIGNATURE-----
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
+