Version bump. Major ebuild update, see bug #452162.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

6 files changed, 172 insertions, 21 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index ede7cde062ab..0cbc05c60cc3 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.177 2013/12/22 13:22:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.178 2013/12/23 23:05:20 eva Exp $
+
+*bluez-5.12 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> +bluez-5.12.ebuild,
+  +files/bluetooth-init.d-r3, files/rfcomm-init.d, metadata.xml:
+  Version bump. Major ebuild update, see bug #452162.
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> bluez-4.101-r7.ebuild:
   Stable for ppc64, wrt bug #487748
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index dbb03775defa..79e23639b096 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX bluetooth-init.d-r2 532 SHA256 cd8cc3763601470328709c961b0c68a311f6d4af302d46a880fb855ed9d04efe SHA512 a1a391ac545d69aa15a1f98349e68b06b3468759acef95ea82d7cdec58ba40c3d03bda87e0279d186440c84ea940ae09d075269f6cb6b27cf2ca1f2a329e842b WHIRLPOOL ae6b78b8f8d56a567a2d80693366ebc319447267345db373e3b01dcf2c58078cf1615529589f3c3fb1237f7c617583639f3ae501018d11a8eaf68186938bddd2
+AUX bluetooth-init.d-r3 556 SHA256 28ba88247428aeb94617cd2388ab7b1a217daee68ef1b853e661659ec50251c1 SHA512 1493c23d7a256ba236668a0927238054b78358cbe3d6ce965aecaf8fad52ca79573d0c4c6077578bc5d8ebb740a00ddc0e8674d32510866f701f1b753f3172fb WHIRLPOOL 1c2e0b3dffce596f11e48c1060aadfdc8075c4ded2acfb8c7d23b7e2aeb7396b1829870049112d91ce65a250b2a0322bcbf0db3b6fae5e9c8f9f658dc5c7a6d4
 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
@@ -9,28 +10,20 @@ AUX bluez-4.101-network3.patch 877 SHA256 2b7ca0ac1bde85ff2fc627c2f89b2b65aaa33c
 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 668 SHA256 4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e SHA512 8f14b4e05c9ecaf4586ed2fdc2d2519de6b613de62ae5c95508baa682630f3112c5b6db6850f76679afc49e06f2ad035d148fa30b9b980747b6fb423f7bebe88 WHIRLPOOL 59859206a2b21580b92e747f06188ec362b41e1b7aa988de86e133ed8ea619f1166547231b9851c2dbd9298c84a1f33d39bc08932cad403087b123d370332236
+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
 EBUILD bluez-4.101-r8.ebuild 4248 SHA256 788306f989e82fb6cd78cfc737f0d04ac895756775dc881105fa697857abca70 SHA512 f4660681dc7bfd0278a98ef634f9fb4e6f672ec2bdae0e536e634626d3b9f93a4dcb650d1e6b082903dbd3927bcf02996d501513dc78d777e4fe48977db8a75b WHIRLPOOL 11a2862b8696d4b7424e89bf579f81059ab84a0b72595722443b455b18165a0f3dedcbbc7996cb94441ad7709465fa276485bad5a7d490a051efda515fb5e9f7
-MISC ChangeLog 33011 SHA256 2cb867305f1b2e1d1b30d1381e39af513ec4e32aee4a93fa46cb5b065260b4cc SHA512 e7ea5df383faf2b4e9f102b84b155f5d27db1e6d9327149cae830bf76f3d9bed8357d6e6f4b9a1e37fa2f61fded84a49d2cc4ffbd1354b3085c1a8a64e23417a WHIRLPOOL b1d87a8408a76832770860c91ad8e8659d5124b2e76e0e998f58e5bce3711a9e0ea9d4ca8e1f722b70cf5484235678672a874f325da329bef4a4b963f9c075f9
-MISC metadata.xml 700 SHA256 3669e2be70e3ce3361ee3354994aa20e6434b034726155630152f4aca47b54fd SHA512 974d3eff1bfaf6a52f411deca744fe75d720d4dfcd54e83c401e4f48511d822937408bdece5d79fcd42125d009bbbbcb489b9b64d76b26320e524d58c83caffc WHIRLPOOL 607eeb3e7e1e9eec199b0dd6a0caf9160ee72b7b920f7d74d03b076569b87b4406d5c08a87db6835669cd4f9b0f6dca2d9bc658af9770906fd25af3e22ecd73f
+EBUILD bluez-5.12.ebuild 3308 SHA256 8074412d76f70a1177813b2ba1a43c12b8c3a5353e8952a897f44248cceee8e7 SHA512 d7beb74bc92081fd2349bfb101aff0abd1ca016f8cb9dfcb40805513d50552b7cb9c760e1af5456494eb79e39cc4753fb14d5b9787cb1f83bdcc5e3a70bb3c28 WHIRLPOOL 1ed1ab23d2e8cbaae93333a68d03cbf23697dbdd417784c0b7810094506e7d84f682da3c6ae2f6168f8210f0a1ab4e057ce7343b1bbd1432d0a3225f168813f6
+MISC ChangeLog 33232 SHA256 a574fbe8651d330824069b19fd0926d98c58ed2c0a1d41aff107e7c089305620 SHA512 b8f48d9f6318cf7b7bf3694d00448d30c8af86801fad26b66361141f4289773a07465f3a7d0e32d6315fb02548d96144cb6881ac157323da491244c1cf0bd96f WHIRLPOOL 9b5f899ae8d1e14a2acfd5c4c2538cbff6bf059e5ee99aa55082bcfb9205c579e795b084cc7ee90b1e4237df3adc62a5ff8f28c84745dcccbf4cd739bba29285
+MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJStuaLAAoJELp701BxlEWfkyoP/RaU5ZNFocYmvBftp4LnxVOo
-fqhODRZF4hoEke5ULzsvUrxyxe1DS2vzc3KjBxNr34gJMcx8WoYyNAD8Gu53Pwx0
-jcqQVeE8qbcGnNtwXHI/Qtsd2QK/n8tZ5pXx37rFBmlngq42Jx67CPANlBLQ5sS/
-yoVm9v35lW8vHpRgLr+Nf6Nxyz5AkC6ioY36CBGhiIfpdnYUmzCFo8WUWySdfNM3
-9ZsQr23de9JH1lcBUXM9repTn6zHY08bQ6y+3KNb+fy7sBvizQ9DSGWwMwnhKgBs
-VNFGKOCw1AEDN0xam/920YaqTW8/YUk3WClRaqu0RdewxGC6/HijVvX7FNR0xGtI
-IQIDWMTmNo0aAVW/Khy0noHdU9C4f5OdGOdAtKzkmbNgS2Jj8sGBmRT/dNk2ReR2
-BgJsqjuvb3zIHnSsUu/05T8cPCPo/3/e54w1x/b4megotnkPWAmBlKsnhWkYSyie
-watRIywhXFu0S+538Oi4+INDT1Tf2+tzhdpzGl8EM+r8jlbgeQvhPVjtvUbNffri
-KoH9U9t2BNNv01WoDx1R+p2TFDq2tPh6cCeC6RhZSQDJrzGQFSniXr2hEyM30F/w
-XQXUw/XPqASstLmbXdouKoGDAmOiwWgkaGZJZKow3E8+X1zOA9vWPIA/VojNmAeg
-mR7LQLf219sWf9SBdeEV
-=RwNx
+iEYEAREIAAYFAlK4wbEACgkQ1fmVwcYIWAZ6dQCgnAwYH2Cq7u0uPP1CXGLLwSjD
+o5gAn0q5waGRwtIHlx8BT38hAb2/dos4
+=A3ct
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-5.12.ebuild b/net-wireless/bluez/bluez-5.12.ebuild
new file mode 100644
index 000000000000..eb19316ce4a4
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.12.ebuild
@@ -0,0 +1,130 @@
+# 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-5.12.ebuild,v 1.1 2013/12/23 23:05:20 eva 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"
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.6:=
+	>=sys-apps/hwids-20121202.2
+	>=virtual/udev-171
+	cups? ( net-print/cups:= )
+	obex? ( dev-libs/libical )
+	readline? ( sys-libs/readline:= )
+	selinux? ( sec-policy/selinux-bluetooth )
+	systemd? ( sys-apps/systemd )
+"
+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
+}
+
+src_prepare() {
+	# 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() {
+	# readline is automagic when client is enabled
+	export ac_cv_header_readline_readline_h=$(usex readline)
+
+	# Missing flags: experimental (sap, nfc, ...)
+	# Keep this in ./configure --help order!
+	econf \
+		--localstatedir=/var \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		$(use_enable test) \
+		--enable-tools \
+		--enable-monitor \
+		--enable-udev \
+		$(use_enable cups) \
+		--enable-obex \
+		--enable-client \
+		$(use_enable systemd) \
+		$(systemd_with_unitdir) \
+		--enable-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
+	newinitd "${FILESDIR}"/rfcomm-init.d rfcomm
+	newconfd "${FILESDIR}"/rfcomm-conf.d rfcomm
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	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/files/bluetooth-init.d-r3 b/net-wireless/bluez/files/bluetooth-init.d-r3
new file mode 100644
index 000000000000..c7afe112cedf
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-init.d-r3
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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-r3,v 1.1 2013/12/23 23:05:20 eva Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount hostname
+}
+
+start() {
+   	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/libexec/bluetooth/bluetoothd
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down ${SVCNAME}"
+	start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd
+	eend $?
+}
diff --git a/net-wireless/bluez/files/rfcomm-init.d b/net-wireless/bluez/files/rfcomm-init.d
index d3b819e1abea..18b0e1e35cbb 100644
--- a/net-wireless/bluez/files/rfcomm-init.d
+++ b/net-wireless/bluez/files/rfcomm-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.2 2013/12/23 23:05:20 eva Exp $
 
 depend() {
 	after coldplug
@@ -23,5 +23,5 @@ start() {
 stop() {
 	ebegin "Shutting down rfcomm"
 	/usr/bin/rfcomm release all
-	eend $?	
+	eend $?
 }
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 45eaf1bd01b1..de19c8b55394 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -12,6 +12,7 @@
 			as regular USB HID devices, but needs them to be
 			paired before enabling this, otherwise they won't be
 			detected</flag>
+    <flag name="obex">Enable OBEX transfer support.</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>