Version bump, drop old

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

11 files changed, 84 insertions, 558 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 958b1d147e6b..3e6f64ed72ab 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,16 @@
 # 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.185 2014/01/19 10:31:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.186 2014/02/09 09:10:28 pacho Exp $
+
+*bluez-5.14 (09 Feb 2014)
+
+  09 Feb 2014; Pacho Ramos <pacho@gentoo.org> +bluez-5.14.ebuild,
+  +files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch,
+  -bluez-4.101-r6.ebuild, -bluez-4.101-r7.ebuild, -bluez-5.12.ebuild,
+  -files/bluez-4.101-mgmt-update.patch, -files/bluez-4.101-network1.patch,
+  -files/bluez-4.101-network2.patch, -files/bluez-4.101-network3.patch,
+  -files/bluez-4.101-network4.patch:
+  Version bump, drop old
 
   19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bluez-4.101-r8.ebuild:
   Stable for ppc64, wrt bug #496866
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 806acdfa8ba9..66f8daffc0fa 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,39 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch 1907 SHA256 4c07ccb23953e83d805b8b0c726a08121dc17deb26f7571bca32dfafe7bd2881 SHA512 17a0967ac291be3822e2be73912ab4c1720564bdce0765582e54bc0347d0477d38f82dbf0db9d660f982c35b3c2ea13dd37b22e18223d36745306c4c9d859423 WHIRLPOOL 67a3ab27c5f6bb15894f1fb55c9947fd97c9e64c380fe0f52540887c12f7052d54b34c2cbda3f62bcf27888c2400ddac9b239a138383f74ad28616aebefdae84
 AUX bluetooth-init.d-r2 532 SHA256 cd8cc3763601470328709c961b0c68a311f6d4af302d46a880fb855ed9d04efe SHA512 a1a391ac545d69aa15a1f98349e68b06b3468759acef95ea82d7cdec58ba40c3d03bda87e0279d186440c84ea940ae09d075269f6cb6b27cf2ca1f2a329e842b WHIRLPOOL ae6b78b8f8d56a567a2d80693366ebc319447267345db373e3b01dcf2c58078cf1615529589f3c3fb1237f7c617583639f3ae501018d11a8eaf68186938bddd2
 AUX bluetooth-init.d-r3 571 SHA256 de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7 SHA512 e5f550a8c0b5c9e8902c920b1bd1ef120698b568fe38220eae2d49099e364ea7b05e3026356e857666a515bb9137c92a774ca1fc70a2b6814b4d03fe29c2ccc2 WHIRLPOOL 84a3655b8b13985759365ac220a27fcc18cdf97373032e2040cf4a5b27a8b1a5df92aa6b45e92442010b338419d82c4f9548af03602c101e9f34d623e4b1b174
-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
-AUX bluez-4.101-network4.patch 3002 SHA256 e942b805f73f283eaec153ada1f462deb1fcdfaef4543f449f7c08ffbc82d6e9 SHA512 4de8714689eb53b4fa8e80f0070fd7c8077c4388766434a7d046252d6667455945344a6522a5803d70be3905368a05b332fc302148c20abb21a646e05539d1ef WHIRLPOOL 16aa66ab50695f9e86f1b836f3cf8d272e8a6c07df4dab30e2606942e6a09e2766a854d741331de5d11e741579c7af674b3609cb2a17340b0066885bad012462
 AUX bluez-plugdev.patch 469 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2 SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 WHIRLPOOL 6364590d80d811e55e2f696ba0b57c0173bac859e69de284bbcc3b511c7ea639d48dd7451e5a4abe8746b8c0986867cb680b291880e6a6ada03004e0c72c2583
 AUX rfcomm-conf.d 150 SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 SHA512 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb WHIRLPOOL 4d8b1f17c87120fcc21eb49644b27813a9463d990d3533cd542710cd14981cb74528b978ca65001fa60153e05260a0ee0a7af1d2855b04484ec1f7318acda8f0
 AUX rfcomm-init.d 665 SHA256 88df441dc7a7d5ce28005e311168690ecf877148efc5264e310189a6baedc05e SHA512 30ddaa1e0572d6b436dd20a89ebfdc83369c10ccc307e184c8437ff8b1a91078a4315958f1b013cb1568817562c17440f9ca1284f686ec9bc542cd6d0d321097 WHIRLPOOL b050e49599481a8a13e6ed47fad919b9eaaf39dffe0774783c57a26cbc27c15d59591a6edd19ede7a9844ac6de211fc3d37ced06052d34a9ab02dae271b9696e
 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.12.tar.xz 1118340 SHA256 75ef574f15f356d03bd54f1a8ba26abe63bf3d1326a9fa12d63a762ddf40617e SHA512 28fcd3fdda3d67d9248f8ee3d2136558f0ba3e95481ca4729ec5d328a74eb2a6fe29271f9e0ea78df3a59cccd7bd262d5d6b4cf250162b934d7bdb6eb4e36119 WHIRLPOOL 0ef4620bbdd4b626cdb258e79bbb641d8612ef587b9c315c0b8ca68495758a07d9e788dc52eb1c62f46be7e9b52c9e16428c7b22cce530d380b8fce2e0aa3cfb
-EBUILD bluez-4.101-r6.ebuild 4037 SHA256 50c82859fe02b84af633840b14e5bbb288bff24cd5752a847181180fd30978b1 SHA512 3937aa7156c24bb1260a298fe17404a3a0cebf329da0ce5d15b66cade34532b2469506fbfbff30f7a1687534eb97f3cb2314934e8d939e97bfb0543d4de3987e WHIRLPOOL 47a507a22e86bdec0042e47d45c32915fa50062c3b889e8e94e32e590bc7cf195be920d3a9c040713fd25ecd78246d689c1ecbda34d982092aa69fefc4fdc19d
-EBUILD bluez-4.101-r7.ebuild 4227 SHA256 09c678f24a3115542e932c575f42640580b236f00ff234cea2e262162f84c0fe SHA512 9c715bca7789316b77b951be7a7c33c652ded174621c802efe0ffe3d0dde863f0cab25001dec3a54caede12de6cf339b867c66a79f7fb1ed16b558d4a8973da5 WHIRLPOOL fbbf6e95da5c9b9b4150d1822b08fd0d96764adfca0dd4fe4feb57c332940f775a4c5d4ec1bf8bd2ad2f4ede149c586b78801e715f24cea093cbee1994c4d1a0
+DIST bluez-5.14.tar.xz 1209352 SHA256 5a485837c215f3093d3a98cb412dc99e1139f88a66c8809bdf183ad5e676395f SHA512 41ff320157b034f1b075266d8a6e0ffc9a2eccb2a4ae90abaec0970abd144a3e536292e826bd47f82e7fd52c1d370d45fba537f54e5cb8d6e9e306ab30f4af0f WHIRLPOOL 0a951d6fe9572b77cc05758cc947b23681a49823fc9e23cb645444892e33c093e5b4d979763b53e6f4898569d073b0f320d491818f9bfddb2feb132eb70c7b44
 EBUILD bluez-4.101-r8.ebuild 4240 SHA256 b6a8079aaa7d88894758ae5ebb9c0e45099c1593e6a4d2814aa521a55f58eac2 SHA512 149053e66990a699dc393b98d3b009d01174d88704195fc7e80831701fff1c1bd32b60a31e9642170b10d52b2211452de4309c75478fe78ae5640f161b8e639b WHIRLPOOL 15710a42aeda2fa1ce49525eb8281844d5f0e7f4f637b677aaad41d510145fba1ef5932fcd1a0fa9cdaeca0b9100bdd1059574caead836c09476f6d9f2928f80
-EBUILD bluez-5.12.ebuild 3308 SHA256 8074412d76f70a1177813b2ba1a43c12b8c3a5353e8952a897f44248cceee8e7 SHA512 d7beb74bc92081fd2349bfb101aff0abd1ca016f8cb9dfcb40805513d50552b7cb9c760e1af5456494eb79e39cc4753fb14d5b9787cb1f83bdcc5e3a70bb3c28 WHIRLPOOL 1ed1ab23d2e8cbaae93333a68d03cbf23697dbdd417784c0b7810094506e7d84f682da3c6ae2f6168f8210f0a1ab4e057ce7343b1bbd1432d0a3225f168813f6
-MISC ChangeLog 34048 SHA256 0ef42cf71ad61ca00696819eb36468eed79573cc822312fb918d5c867e42259e SHA512 beb43cb4fc3051a1b437938f6e2a53821164778f8788fcc4f00d8cfe5fee14b75c1665e8280734a9a8e90a46a22ed894735961eb402280d306d69e645e1f340a WHIRLPOOL 37aab6b8f8cc54d27a1600b4ce876094ae3148f52b2d8b161c5f7e45f3ba2376e46a9934b749a0ef932e0c7a74e3a40d68680a306601cc35dfca25be5d8a8559
+EBUILD bluez-5.14.ebuild 3450 SHA256 ed2044a2f4cb8ff333916185c97225b96828d66e8f840f0e8602773f231b3d70 SHA512 42d2c38675fdc64eec23523d546ca3663c5fa56c391160905ef54a98dbb1b2240f8df68a5ee660c219e65143de59aa60b4dd1b25336c969519605a66c66a06ad WHIRLPOOL d7f48fb526200aeb3d17181f43b49707b3167a90e468db9e84d559fc95d181b080f113726a453e6ff4153593b0effc9b1a890a6bbddb822975432e2c42f21433
+MISC ChangeLog 34497 SHA256 9e71b969412bbf6ba8d3e293894ceca2aa93f071fd81b8ff3191030262ec2c64 SHA512 22a8b3518fd02eccaed901a0b20c5d5b29beb28f2c08b9330cdd0af5121b2c74b40cf2f6270d022910532d54d24260e42d64871f88839553ff70d9acc752a15e WHIRLPOOL 5a5f293a4727a589c27c50b76fffd8b92dce70121fbaf019a475ef159965cef2d57ec8097d672d0be3e429e873cb3a9df948a31bbdeec28ed5ee965112cc34ee
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS26lqAAoJELp701BxlEWfEMkP/1E9cnW+dHykgWseB1bmK84m
-pilhiBg3GoWF3E2QbIe0okgerAHT4rrGWtinF6m4hwb+G+UOBi/yt0au9KE18zGH
-T2HLpWxhrMJv/kNVGs2gnTrAGi6SuJD0Pf6/FCUe9WFueN72E0NBUcCtx7k4Jwyo
-Psv5Hqkms1EWAJm0xz2EVeME4+v7U2aRVXaEd2DX8rPy+JIf5q26aDodPd79QWEs
-B6HCs3vEYxIuRTSXbz8SWvp42NjDG8DqPX6oKxts0FZ69U4ybo38M167UgJQYtBF
-uhVbap6feTp4hZsB0U0ZGCe2i0Sq9C3eohDQuMcElu3xo0HIKlkgiICWxcwHSMu5
-KwD9tXjkv0vrigVzt6jsxmUjrd/BGlpM01l+24hJCBuMEV8aeAq0R9mTYWGpZIZ6
-KriEhqe/pnblD+/wCkptf9WFwcmE2Dd2IHLqdrHMcnm6jepX4UJPl8q+GWChs3Rg
-a678G9+UhZ03TU6LXPslqX/drgPUVPzJE/vJXRXVOdFkdxM7961iQMhp3sb1o8aw
-8122psjB0uWSM187faG5htrarIraH72bgdVv29vM9ol7eMP1mpKYv1VYbSbbnYaI
-hclQssyT0QZ1hEiPYu3lRJOqQu5eNUimU0Zesn2zaPCQEQ3cJkoWddI0LajuZcKs
-PS5Ut8qmcpJDZIozrcTE
-=1zJU
+iEYEAREIAAYFAlL3RgYACgkQCaWpQKGI+9SXKACeIyZjq2RIGB8eJ29PVNqPImrT
+hHQAnAjuJjGrizoVlPlEjiSn3SQWbDNA
+=3oay
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.101-r6.ebuild b/net-wireless/bluez/bluez-4.101-r6.ebuild
deleted file mode 100644
index fa20cfc3da18..000000000000
--- a/net-wireless/bluez/bluez-4.101-r6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r6.ebuild,v 1.7 2013/09/25 17:21:36 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit 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"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa cups debug gstreamer 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() {
-	epatch "${FILESDIR}"/${P}-network{1,2,3,4}.patch
-
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	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) \
-		--enable-tools \
-		--enable-bccmd \
-		$(use_enable pcmcia) \
-		--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-4.101-r7.ebuild b/net-wireless/bluez/bluez-4.101-r7.ebuild
deleted file mode 100644
index 6671f7da5b45..000000000000
--- a/net-wireless/bluez/bluez-4.101-r7.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r7.ebuild,v 1.8 2013/12/22 13:22:03 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 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) \
-		--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.12.ebuild b/net-wireless/bluez/bluez-5.14.ebuild
index eb19316ce4a4..64399c323689 100644
--- a/net-wireless/bluez/bluez-5.12.ebuild
+++ b/net-wireless/bluez/bluez-5.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.12.ebuild,v 1.1 2013/12/23 23:05:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.14.ebuild,v 1.1 2014/02/09 09:10:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -14,7 +14,7 @@ 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"
+IUSE="cups debug +obex readline selinux systemd test"
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -52,6 +52,9 @@ src_prepare() {
 	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
 	epatch "${FILESDIR}"/bluez-plugdev.patch
 
+	# Fedora patch for better compat with non-full systemd setups
+	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
 	if use cups; then
 		sed -i \
 			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
@@ -64,9 +67,9 @@ src_configure() {
 	export ac_cv_header_readline_readline_h=$(usex readline)
 
 	# Missing flags: experimental (sap, nfc, ...)
-	# Keep this in ./configure --help order!
 	econf \
 		--localstatedir=/var \
+		--enable-experimental \
 		--enable-optimization \
 		$(use_enable debug) \
 		--enable-pie \
@@ -77,7 +80,7 @@ src_configure() {
 		--enable-monitor \
 		--enable-udev \
 		$(use_enable cups) \
-		--enable-obex \
+		$(use_enable obex) \
 		--enable-client \
 		$(use_enable systemd) \
 		$(systemd_with_unitdir) \
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
new file mode 100644
index 000000000000..1ea3e6f3e0c1
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
@@ -0,0 +1,58 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
diff --git a/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch b/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
deleted file mode 100644
index c7523e6a2ff6..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
diff --git a/net-wireless/bluez/files/bluez-4.101-network1.patch b/net-wireless/bluez/files/bluez-4.101-network1.patch
deleted file mode 100644
index cf75d07bfe5f..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=profiles%2Fnetwork%2Fserver.c;h=8ae608cdb6e699ad78cd7476e26c60f8883a214f;hp=480c7e2c5f6ab1cc7c494a3bcc37d1a0026a0ce4;hb=2b44cd2fba6e9a8590f30e68db0f6b92e8fcdb94;hpb=04be4fe0c0126f8816d55a7d3a8ff9e6dd27f73f
-
-diff --git a/profiles/network/server.c b/profiles/network/server.c
-index 480c7e2..8ae608c 100644
---- a/profiles/network/server.c
-+++ b/profiles/network/server.c
-@@ -301,7 +301,10 @@ static uint16_t bnep_setup_chk(uint16_t dst_role, uint16_t src_role)
- static uint16_t bnep_setup_decode(struct bnep_setup_conn_req *req,
- 				uint16_t *dst_role, uint16_t *src_role)
- {
-+	const uint8_t bt_base[] = { 0x00, 0x00, 0x10, 0x00, 0x80, 0x00,
-+				0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB };
- 	uint8_t *dest, *source;
-+	uint32_t val;
- 
- 	dest = req->service;
- 	source = req->service + req->uuid_size;
-@@ -311,10 +314,27 @@ static uint16_t bnep_setup_decode(struct bnep_setup_conn_req *req,
- 		*dst_role = bt_get_be16(dest);
- 		*src_role = bt_get_be16(source);
- 		break;
--	case 4: /* UUID32 */
- 	case 16: /* UUID128 */
--		*dst_role = bt_get_be32(dest);
--		*src_role = bt_get_be32(source);
-+		/* Check that the bytes in the UUID, except the service ID
-+		 * itself, are correct. The service ID is checked in
-+		 * bnep_setup_chk(). */
-+		if (memcmp(&dest[4], bt_base, sizeof(bt_base)) != 0)
-+			return BNEP_CONN_INVALID_DST;
-+		if (memcmp(&source[4], bt_base, sizeof(bt_base)) != 0)
-+			return BNEP_CONN_INVALID_SRC;
-+
-+		/* Intentional no-break */
-+
-+	case 4: /* UUID32 */
-+		val = bt_get_be32(dest);
-+		if (val > 0xffff)
-+			return BNEP_CONN_INVALID_DST;
-+		*dst_role = val;
-+
-+		val = bt_get_be32(source);
-+		if (val > 0xffff)
-+			return BNEP_CONN_INVALID_SRC;
-+		*src_role = val;
- 		break;
- 	default:
- 		return BNEP_CONN_INVALID_SVC;
diff --git a/net-wireless/bluez/files/bluez-4.101-network2.patch b/net-wireless/bluez/files/bluez-4.101-network2.patch
deleted file mode 100644
index 807eb1912b96..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=network%2Fconnection.c;h=59423a900b2fba9ec99115dec421a3113bc2d834;hp=544ec3a9c643bc8fada6d683d428a8165a4b052f;hb=57170b311f1468330f4a9961dc0b3ac45f97bc13;hpb=c1d662075288d475ee6e1740d39ac84fe806542a
-
-diff --git a/network/connection.c b/network/connection.c
-index 544ec3a..59423a9 100644
---- a/network/connection.c
-+++ b/network/connection.c
-@@ -554,7 +554,9 @@ static void path_unregister(void *data)
- 
- static const GDBusMethodTable connection_methods[] = {
- 	{ GDBUS_ASYNC_METHOD("Connect",
--			NULL, NULL, connection_connect) },
-+				GDBUS_ARGS({"uuid", "s"}),
-+				GDBUS_ARGS({"interface", "s"}),
-+				connection_connect) },
- 	{ GDBUS_METHOD("Disconnect",
- 			NULL, NULL, connection_disconnect) },
- 	{ GDBUS_METHOD("GetProperties",
diff --git a/net-wireless/bluez/files/bluez-4.101-network3.patch b/net-wireless/bluez/files/bluez-4.101-network3.patch
deleted file mode 100644
index 7f9afb01c78a..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b57c64f1aa5c51dd785f2572636b8c41ada06d72 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 30 Aug 2011 15:10:46 +0200
-Subject: [PATCH 1/1] network: NULL dereference fix
-
-Variable ifindex dereferenced on line 242 before null check on line 249.
----
- network/common.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/network/common.c b/network/common.c
-index 4704072..a223685 100644
---- a/network/common.c
-+++ b/network/common.c
-@@ -240,13 +240,15 @@ int bnep_if_down(const char *devname)
- 
- int bnep_add_to_bridge(const char *devname, const char *bridge)
- {
--	int ifindex = if_nametoindex(devname);
-+	int ifindex;
- 	struct ifreq ifr;
- 	int sk, err;
- 
- 	if (!devname || !bridge)
- 		return -EINVAL;
- 
-+	ifindex = if_nametoindex(devname);
-+
- 	sk = socket(AF_INET, SOCK_STREAM, 0);
- 	if (sk < 0)
- 		return -1;
--- 
-1.7.7.6
-
diff --git a/net-wireless/bluez/files/bluez-4.101-network4.patch b/net-wireless/bluez/files/bluez-4.101-network4.patch
deleted file mode 100644
index a1166fa4e7af..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a66a557038c0e3d21bc4f14090efb497558a12be Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Tue, 26 Jun 2012 18:11:25 -0300
-Subject: [PATCH 1/1] Fix GDBus flags after conversion to macros
-
-Commit "aa3b9016bf444b60e1b7e1804dfc323a23a93c5a Convert GDBus methods
-to use macro helpers" converted the previous tables to use the new
-macros but some flags were lost.
----
- attrib/client.c   |    2 +-
- audio/control.c   |    2 +-
- audio/headset.c   |    2 +-
- audio/transport.c |    2 +-
- src/manager.c     |    2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/attrib/client.c b/attrib/client.c
-index 8d119df..b3e3abe 100644
---- a/attrib/client.c
-+++ b/attrib/client.c
-@@ -519,7 +519,7 @@ static const GDBusMethodTable char_methods[] = {
- 	{ GDBUS_METHOD("GetProperties",
- 			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
- 			get_properties) },
--	{ GDBUS_METHOD("SetProperty",
-+	{ GDBUS_ASYNC_METHOD("SetProperty",
- 			GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL,
- 			set_property) },
- 	{ }
-diff --git a/audio/control.c b/audio/control.c
-index c5a6a58..187f838 100644
---- a/audio/control.c
-+++ b/audio/control.c
-@@ -198,7 +198,7 @@ static DBusMessage *control_get_properties(DBusConnection *conn,
- }
- 
- static const GDBusMethodTable control_methods[] = {
--	{ GDBUS_ASYNC_METHOD("IsConnected",
-+	{ GDBUS_DEPRECATED_METHOD("IsConnected",
- 				NULL, GDBUS_ARGS({ "connected", "b" }),
- 				control_is_connected) },
- 	{ GDBUS_METHOD("GetProperties",
-diff --git a/audio/headset.c b/audio/headset.c
-index 729e4dc..b9c6265 100644
---- a/audio/headset.c
-+++ b/audio/headset.c
-@@ -2094,7 +2094,7 @@ static const GDBusMethodTable headset_methods[] = {
- static const GDBusSignalTable headset_signals[] = {
- 	{ GDBUS_DEPRECATED_SIGNAL("Connected", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Disconnected", NULL) },
--	{ GDBUS_DEPRECATED_SIGNAL("AnswerRequested", NULL) },
-+	{ GDBUS_SIGNAL("AnswerRequested", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Stopped", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Playing", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("SpeakerGainChanged",
-diff --git a/audio/transport.c b/audio/transport.c
-index b015625..832ad2a 100644
---- a/audio/transport.c
-+++ b/audio/transport.c
-@@ -959,7 +959,7 @@ static const GDBusMethodTable transport_methods[] = {
- 	{ GDBUS_ASYNC_METHOD("Release",
- 			GDBUS_ARGS({ "access_type", "s" }), NULL,
- 			release ) },
--	{ GDBUS_ASYNC_METHOD("SetProperty",
-+	{ GDBUS_METHOD("SetProperty",
- 			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
- 			NULL, set_property) },
- 	{ },
-diff --git a/src/manager.c b/src/manager.c
-index 385354d..7061f64 100644
---- a/src/manager.c
-+++ b/src/manager.c
-@@ -207,7 +207,7 @@ static const GDBusMethodTable manager_methods[] = {
- 			GDBUS_ARGS({ "pattern", "s" }),
- 			GDBUS_ARGS({ "adapter", "o" }),
- 			find_adapter) },
--	{ GDBUS_ASYNC_METHOD("ListAdapters",
-+	{ GDBUS_DEPRECATED_METHOD("ListAdapters",
- 			NULL, GDBUS_ARGS({ "adapters", "ao" }),
- 			list_adapters) },
- 	{ }
--- 
-1.7.7.6
-