Add a new reference about missing tools, drop old

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

6 files changed, 13 insertions, 531 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 525884a510c7..bd64d3a27aa7 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.221 2014/10/11 13:34:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.222 2014/10/21 14:30:27 pacho Exp $
+
+  21 Oct 2014; Pacho Ramos <pacho@gentoo.org> -bluez-4.101-r8.ebuild,
+  -bluez-5.18.ebuild, -bluez-5.23.ebuild, bluez-5.24.ebuild:
+  Add a new reference about missing tools, drop old
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> bluez-4.101-r9.ebuild:
   arm stable, bug #512012
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index ea2e7655871e..87adb64177ff 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -15,22 +15,17 @@ AUX rfcomm-init.d 665 SHA256 88df441dc7a7d5ce28005e311168690ecf877148efc5264e310
 AUX rfcomm-init.d-r2 661 SHA256 e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09 SHA512 ec3968c79bd4b0ac57f4a0fd2f286b3380951af183c68ae9c9b57339d74931d98984b3594c9e10db9f61eb2160e214572a4bae8885cd4ff9192dbbfc357d20a5 WHIRLPOOL c37f516e2485c21d4613b821d53c2f2782ffa50a1cc4263ea8bd44c064088651c05c4880edd397fdc20b0c5f0805bef6a06ec0606748f16cd67dd7e35757fe34
 DIST bluez-4.101-patches.tar.xz 12380 SHA256 ea4b837245080ebe904fe4f338cd3c8c1370e197cdfbcd42bd55430c940b5e13 SHA512 0ef3219ed923a0880b2fe7008c36c185ff631a8fe1b357cc3612888817d9a7eaa6624bd31ed00a8bbbb6739528cb777a0b9900a7db4930482d1cbc38417b89aa WHIRLPOOL b89729b2cb1ecd6c816210682605b275af396af056e85d9a8671192ede0470002c1f61931781f27ad988ce8bc137f69a6725008a5ea9fe743ae41bc2f5edc7e8
 DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196
-DIST bluez-5.18.tar.xz 1308192 SHA256 8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340 SHA512 fbf5d68ae6a0c5c33fb0c645f0b6625624ffb08aa498147c90df53c5a5b3a9e67dc4ae5fcba81fb8399755287ca78cc31f936e7ac3a7760fde9783408a459188 WHIRLPOOL 3cf2e66fc05c996cf2ca2dcb1cd17dc248b0f8ff3ddb95f656b5229058888816a5591ff74f270de88a192e60bcd07145cbf81839e0291fc1316f92e6b1db19f3
 DIST bluez-5.21.tar.xz 1387560 SHA256 81eb073516f39ff1fa02fa40120e834f40fdb0b772f8f4153a9ab566cc0a1f4f SHA512 41ce678abd050ad020d1e04e52740167746eaa7f35e339784c07dec44995b07a8e4e96f0e9530eed2faa50c95c756d56ea0c4d412421b69698f8ca4c9051d07e WHIRLPOOL 60d3312fa66903a8a92ab516558cefc9ddc5c81e8cf632fa7a13ce170f10db94ecef52611c704c4d2f5db5eb0470fca8b6fec0ce59136f4c864a3d08c7bad2ff
-DIST bluez-5.23.tar.xz 1426660 SHA256 cdabd38d7ac8dd392a77ce7d76d5c120b277e4115040ba5d3ab91c05ab37f2c1 SHA512 5cbb5c34963c5b70badab618018eda5017b44d240c3a47b4bbaf88e41b67617c5a299a21509a917ef3bb91be79032aa10837138283b6510e2829a6be1554ef92 WHIRLPOOL c3049637a97c80301307fa8ce7618763df706223d103e6a79c41eecc68203bcd0f999f8f523048acac6f07884ce4ecbc0ef9e2f80bbdafacbbef289fb9531fc8
 DIST bluez-5.24.tar.xz 1444536 SHA256 e870c5fba0bf3496856fc720e2d217856fcf40b59829f8cc0c05902ebb9fb837 SHA512 e4372c5a74dff8c399693504139bbd0d5b7b06822e659530d30cc5cf12842ad96ed1875eed0c46cc7cb63178cc910c6100988d1bb396580c1e0746e6eea50b13 WHIRLPOOL 60c5b6e045bf280d9298df03ec7aa7d42e7993a3492d5375d324adf02b8fd6af42932d8b3878714d27595b67ee8f5a825d8a9149ab584ac364e3282e829a4618
-EBUILD bluez-4.101-r8.ebuild 4240 SHA256 b6a8079aaa7d88894758ae5ebb9c0e45099c1593e6a4d2814aa521a55f58eac2 SHA512 149053e66990a699dc393b98d3b009d01174d88704195fc7e80831701fff1c1bd32b60a31e9642170b10d52b2211452de4309c75478fe78ae5640f161b8e639b WHIRLPOOL 15710a42aeda2fa1ce49525eb8281844d5f0e7f4f637b677aaad41d510145fba1ef5932fcd1a0fa9cdaeca0b9100bdd1059574caead836c09476f6d9f2928f80
 EBUILD bluez-4.101-r9.ebuild 5290 SHA256 63c55aae8588448a5bf761ade1e988237a55a1305d301ff13ab20f7305528875 SHA512 f807d991af88accb10a4f21ae14a08817ca4c125b6d5bfd0292483397d4bbac347f8cab8162de78ff18f819973d5a9e6b483126eb4b854216a021fee699f26b6 WHIRLPOOL 014617996ca15da044bc3b9e46c0991deee797f4c5721f246dd102547077a12b21f97b05b48ded492aff98021e2b39e67ba036e11ad8358727231aa6822e1e06
-EBUILD bluez-5.18.ebuild 4223 SHA256 29f3e8a2e50892730a8edef97029eac892802ff435c4b7348de24797c161a844 SHA512 0e4b704a40372371a3e416ac8ba229e2e3022bd4d1804b9124be4d905a6b0b8aa568a3ff46ca6811015ea6e17c4dff0df401abdda792d3b378d054397c6c5b0b WHIRLPOOL a753fc2a8867e3ff0d7685c8b062dc67b87ad4ebe8396a304111c7027e5ddfb9dc5446e5c8c598441d9202ce9bba43f3b5f8654032c175389305a085dae76278
 EBUILD bluez-5.21-r1.ebuild 5105 SHA256 ca6e1ecbe2476a287e456d95af4ed56d8b455cc1507b7e299b70f3d4329486cd SHA512 ea766b8745c2da8cdf60e3852f12bad806865a591d71cb68c3dc54d0d34c36db193902c6d3611c78828fdae38489099a4ca5c2cfe68b50c691bfd2e047ccf68b WHIRLPOOL 8ae907d9c39ec1f17366dc988bd7435b329ff8dbe0927909d148d75bf767875ca34de8209436d8d21188d5b911e576d0c0e783ec0b167244215a606039d8ddf6
-EBUILD bluez-5.23.ebuild 5353 SHA256 a6cd356486fd4a6bfbb60e490433939d2b265ca25998cc46ba31d1125726946c SHA512 a490bd63ab34ccded295d5b32d79e7b46a6fcb8811391fd15d53b562299841c34dd474a0043e7fd23d1ff26808007473f14c5b0289980a5ae033cc5a7529da1f WHIRLPOOL 8bb1a23449dffc4e7738aea09289364a48767bf35db874fee96d3024e572c74808ce7f334ec6f557d5abef75fe070ff4d7497b17f472c7e34ec5f2f65f3ea73b
-EBUILD bluez-5.24.ebuild 5633 SHA256 ab27b8497beb0d1c2e1e9feccb8fc09baa5f2c873daa66c91065188bce4a63f6 SHA512 d358ab9085907a94b9f7094b555f8b489f08ccedbc7dd7d299e13fbb2bc80ca92ed702372f34d8640c866e0b9071bceccafc32f27748ec9f91028ee850a271c9 WHIRLPOOL e8bd5a3d80e2e16ac522419603e1f0af73fc9c74a88f64763106376ea24fd024c2e40e6adb324cd28e68ad87bc5e817530d7fdc34e99b405e4f994d9ecb117f8
-MISC ChangeLog 39713 SHA256 2d9c448ed43477ca15480c1d420a64a61d827d7b2923e97fc6367ce149ca3091 SHA512 7c6bd6c203fb07ceb9f32826fae4136d28eea8049cde6aefdcea8638603bed6391a6d11a687d233888dd844c4db20c4721c10ac5350259ec2e0ee48394f0f9f9 WHIRLPOOL f70cb7628f36ae807031d1afcbfe8c860c579829ca4d10916ca5eee305e52b6e6d4c392203cab5b48be95d03b635db3450e8efbaed953b0f9c714d43990a9695
+EBUILD bluez-5.24.ebuild 5674 SHA256 46ea4c3ae5bbdef2df804e4c9d47df5d2a8c3e45410abca16bb6f95cc6317097 SHA512 8af9f16430e7d3101eed998611ad78074e7ed2103d4f29fc3991ec53aeac4b80071be0c0f69812824dd3eada4fe3aa3db76f2b9d8bb22185c7f514cdacf0b155 WHIRLPOOL 69e83bc4422092a3773b86dd07870d318f8a636d88c00c85554251f67b2a37cf01c010cb841e9dc98e8e87d8717b5ab36e1e6ba7ad926166a4a5bfc5ae491771
+MISC ChangeLog 39896 SHA256 9c1d887c8d227bad4b3c78a3e02f37b05a097ec236bd640a7187e5fe90978a16 SHA512 9945df559db9ce1b56e290bedb084399d4852ef8ff8a6b4e4d8f7d50bfc7456123f8c95fdb39e8fe46ea99369ce8740d53d3f72cd0035ccb1015b5045539641a WHIRLPOOL 5b9712bce98ced4e1af6735cede55c5c6c25846b135201f57bd013d794fadccbe1f7fc08390daa577d248e64f695e069882f6e2ad6f52dd910f42e467d821499
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5MfwACgkQkKaRLQcq0GIfiACfVCCbs5hXoYV/OL1rtg2+8QuX
-7EcAoJpE416c/8ndZ8TFUrHhAC2fc+1A
-=XAqW
+iEYEAREIAAYFAlRGbgUACgkQCaWpQKGI+9Qq/gCfYzqpOMW574jcE6Y7TbbP5hX2
+tYYAn0qik7QHRuJ2NbOHT9tRoXod+XLA
+=mQmu
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.101-r8.ebuild b/net-wireless/bluez/bluez-4.101-r8.ebuild
deleted file mode 100644
index 26f6f8d21fd1..000000000000
--- a/net-wireless/bluez/bluez-4.101-r8.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r8.ebuild,v 1.7 2014/01/19 10:31:05 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools eutils multilib python-single-r1 readme.gentoo systemd user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/${P}-patches.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa cups debug gstreamer hid2hci pcmcia readline selinux test-programs usb"
-
-REQUIRED_USE="test-programs? ( ${PYTHON_REQUIRED_USE} )"
-
-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:=
-	)
-	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 )
-"
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	test-programs? (
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-		${PYTHON_DEPS}
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test-programs && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fedora patches
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.{in,tools} || die
-	fi
-}
-
-src_configure() {
-	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 \
-		--localstatedir=/var \
-		--enable-network \
-		--enable-serial \
-		--enable-input \
-		--enable-audio \
-		--enable-service \
-		--enable-health \
-		--enable-pnat \
-		$(use_enable gstreamer) \
-		$(use_enable alsa) \
-		$(use_enable usb) \
-		$(use_enable usb cable) \
-		--enable-tools \
-		--enable-bccmd \
-		$(use_enable pcmcia) \
-		$(use_enable hid2hci) \
-		--enable-dfutool \
-		$(use_enable cups) \
-		$(use_enable test-programs test) \
-		--enable-datafiles \
-		$(use_enable debug) \
-		--enable-maemo6 \
-		--enable-wiimote \
-		--disable-hal \
-		--with-ouifile=/usr/share/misc/oui.txt \
-		--with-systemdunitdir="$(systemd_get_unitdir)"
-}
-
-src_install() {
-	default
-
-	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 #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_fix_shebang "${ED}"
-		popd >/dev/null
-	fi
-
-	insinto /etc/bluetooth
-	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
-
-	readme.gentoo_create_doc
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	udevadm control --reload-rules
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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-5.18.ebuild b/net-wireless/bluez/bluez-5.18.ebuild
deleted file mode 100644
index 2123fc0510a5..000000000000
--- a/net-wireless/bluez/bluez-5.18.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.18.ebuild,v 1.7 2014/05/11 08:26:25 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils multilib python-any-r1 readme.gentoo systemd udev user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.6:=
-	>=sys-apps/hwids-20121202.2
-	cups? ( net-print/cups:= )
-	obex? ( dev-libs/libical )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sec-policy/selinux-bluetooth )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-171 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
-"
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test && python-any-r1_pkg_setup
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
-	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
-	# ???
-	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
-	# Ubuntu workaround for bug #501120
-	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.{in,tools} || die
-	fi
-}
-
-src_configure() {
-	# readline is automagic when client is enabled
-	# --enable-client always needs readline, bug #504038
-	export ac_cv_header_readline_readline_h=$(usex readline)
-
-	# Missing flags: experimental (sap, nfc, ...)
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		$(use_enable test) \
-		--enable-tools \
-		--enable-monitor \
-		$(use_enable cups) \
-		$(use_enable obex) \
-		$(use_enable readline client) \
-		$(use_enable systemd) \
-		$(systemd_with_unitdir) \
-		$(use_enable udev) \
-		$(use_enable udev sixaxis)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Unittests are not that useful once installed
-	if use test ; then
-		rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
-	fi
-
-	insinto /etc/bluetooth
-	local d
-	for d in input network proximity; do
-		doins profiles/${d}/${d}.conf
-	done
-
-	doins src/main.conf
-	doins src/bluetooth.conf
-
-	insinto /usr/share/dbus-1/system-services
-	doins src/org.bluez.service
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	use udev && udev_reload
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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-5.23.ebuild b/net-wireless/bluez/bluez-5.23.ebuild
deleted file mode 100644
index 98e0865d88d1..000000000000
--- a/net-wireless/bluez/bluez-5.23.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.23.ebuild,v 1.2 2014/09/25 09:11:55 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.6:=
-	>=sys-apps/hwids-20121202.2
-	cups? ( net-print/cups:= )
-	obex? ( dev-libs/libical )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sec-policy/selinux-bluetooth )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-172 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
-"
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test && python-any-r1_pkg_setup
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
-	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
-	# ???
-	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
-	# Ubuntu workaround for bug #501120
-	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	# Missing flags: experimental (sap, nfc, ...)
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		$(multilib_native_use_enable test) \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(systemd_with_unitdir) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Unittests are not that useful once installed
-		if use test ; then
-			rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network proximity; do
-		doins profiles/${d}/${d}.conf
-	done
-	doins src/main.conf
-	doins src/bluetooth.conf
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-#	insinto /usr/share/dbus-1/system-services
-#	doins src/org.bluez.service
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
-	newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	use udev && udev_reload
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run bluetooth clients as root. If you want to be able to run bluetooth clients as"
-		elog "a regular user, you need to add the user to the plugdev group."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-5.24.ebuild b/net-wireless/bluez/bluez-5.24.ebuild
index bc28f3722c1a..8a1b5b41fb34 100644
--- a/net-wireless/bluez/bluez-5.24.ebuild
+++ b/net-wireless/bluez/bluez-5.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.24.ebuild,v 1.1 2014/10/11 11:00:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.24.ebuild,v 1.2 2014/10/21 14:30:27 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -149,8 +149,9 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		emake DESTDIR="${D}" install
 
-		# Upstream don't install this for unknown reasons, bug #524640
+		# Upstream don't install this, bug #524640
 		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
 		dobin attrib/gatttool
 		dobin tools/hex2hcd