Version bump, try both udevadm paths (#539844 by Rick Harris), drop old.

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

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index f625d152bea3676c7f0d9a92e053573607f2e8dc..e7ca744e79da9abcf8652408b6c0ba4de8a7bb4d 100644 (file)
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.236 2015/03/03 08:34:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.237 2015/03/22 13:36:53 pacho Exp $
+
+*bluez-5.29 (22 Mar 2015)
+
+  22 Mar 2015; Pacho Ramos <pacho@gentoo.org> +bluez-5.29.ebuild,
+  +files/bluez-udevadm-path.patch, -bluez-5.27.ebuild:
+  Version bump, try both udevadm paths (#539844 by Rick Harris), drop old.
 
   03 Mar 2015; Michał Górny <mgorny@gentoo.org> bluez-5.28.ebuild:
   Remove broken REQUIRED_USE and correct deps for python-any-r1.

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 197d3024d372c5bfd8dcff2a43c111e04cae0a08..ecda725d6e83e74e9594a151dd8c2f9617753e54 100644 (file)
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,36 +9,25 @@ AUX 0004-agent-Assert-possible-infinite-loop.patch 583 SHA256 7164b3c2e759336f92
 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-plugdev.patch 469 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2 SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 WHIRLPOOL 6364590d80d811e55e2f696ba0b57c0173bac859e69de284bbcc3b511c7ea639d48dd7451e5a4abe8746b8c0986867cb680b291880e6a6ada03004e0c72c2583
+AUX bluez-udevadm-path.patch 632 SHA256 0563a95e41ec85a70375e2d1780f5856de1ab61b5632ded77e1587c87100446d SHA512 60b11a0dcefc005104da0ccc2037c667e96191de9c737819c81861e5b17db050dc9ec8a414c9aea3afa8e41f6da613c9f47a2cb1ed8b46746cf01ad82491b2d1 WHIRLPOOL 3afb4f05f2f84b158ae7a5144bbb79dbbbb4d58a50852b16de717d2c7eb3d25507c51498f380c5a118d8ef4cfc3cebf69e80979306267a398100e857397bc16d
 AUX rfcomm-conf.d 150 SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 SHA512 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb WHIRLPOOL 4d8b1f17c87120fcc21eb49644b27813a9463d990d3533cd542710cd14981cb74528b978ca65001fa60153e05260a0ee0a7af1d2855b04484ec1f7318acda8f0
 AUX rfcomm-init.d 665 SHA256 88df441dc7a7d5ce28005e311168690ecf877148efc5264e310189a6baedc05e SHA512 30ddaa1e0572d6b436dd20a89ebfdc83369c10ccc307e184c8437ff8b1a91078a4315958f1b013cb1568817562c17440f9ca1284f686ec9bc542cd6d0d321097 WHIRLPOOL b050e49599481a8a13e6ed47fad919b9eaaf39dffe0774783c57a26cbc27c15d59591a6edd19ede7a9844ac6de211fc3d37ced06052d34a9ab02dae271b9696e
 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.25.tar.xz 1479312 SHA256 5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30 SHA512 2e13c552e771a9066c3170dfca43cca8a16b3afa3580b90ff065301e3a85d35ac47b145f5aa4db42001c466675994e9115d5c1909b7abe76c381114b7f4d872a WHIRLPOOL 28dfe9e7a6eb9a1cb81001f7183a26b3a3cf8d6383b4c6d17e0b851eeb87497e23c8262a07564cb1cc0fcec128627503ff266d17c86c7ebd8906b9c714dc5df1
-DIST bluez-5.27.tar.xz 1542348 SHA256 fbf33cebc76f8c81f28f0d67c71a8a1ec4b04b087460ec7353f7e0c207a1f981 SHA512 5e5e3ec17b4552027559083effb076e9c7d45528765fb27ca1aa1f3d8bb6a4a79c9fda91392f7b5b6da7aabf2b2b6e5bb16b0546323901501a93c53f79a66324 WHIRLPOOL a60350833a3d103ca5070dfe12fd34d312260511c3817bbecbcdc04e3c2898f0d5bab66fa9885778f0116c2a4ac9930cc00dc0c9883d7a70abf2270a49a14309
 DIST bluez-5.28.tar.xz 1553592 SHA256 85bab48f4b47a158739028682c1e09cf30099c8ea9dfe63360055f8e06fc18a9 SHA512 7945604d8fcce86a6c89b04ae5f1c6a7c5e3d7f4788f42e9e0faab0377119b70da319d9eabf05d58e1f91d090996f04194589db313de3cdb5d8e2a9aa5fe3036 WHIRLPOOL 1ee91548a8d32ae530ed5c4e74350eab061eade6bb876a1d9f24922d791990eb570d4b1d85966b8f400bd49a6680d9516dbdbbe5a2208b5ea30f9a58dd655551
+DIST bluez-5.29.tar.xz 1573632 SHA256 df216a6d5ec6133355e5d4ed6b5e7a188a940940d337374e166758513246f0e4 SHA512 0e38416ad6958b122f80569fb483985204667c2472e6f129ea94455e117195567d5f3cb71cc33a7309e28ce0f33936a38952d27190ae32c5f5b7da6c02de0f75 WHIRLPOOL de78be490af87d97a7b99b66a3bcee0c67a9b846333e724ee4c9696da491181540e360ddde88c8c0f1695c0f63fce0d798e243eee14eced04b5aa4e1623b5b39
 EBUILD bluez-4.101-r9.ebuild 5290 SHA256 63c55aae8588448a5bf761ade1e988237a55a1305d301ff13ab20f7305528875 SHA512 f807d991af88accb10a4f21ae14a08817ca4c125b6d5bfd0292483397d4bbac347f8cab8162de78ff18f819973d5a9e6b483126eb4b854216a021fee699f26b6 WHIRLPOOL 014617996ca15da044bc3b9e46c0991deee797f4c5721f246dd102547077a12b21f97b05b48ded492aff98021e2b39e67ba036e11ad8358727231aa6822e1e06
 EBUILD bluez-5.25.ebuild 5608 SHA256 dc2e1119c340b9aab7d4bb8c6a3a3683c68dfc893779a21896a52ae64fcaadfe SHA512 422ad80eb9f36f8d115f667a450a1014799774138c8cb0ad7b40b8cfb033e62297c04e975d060ab5e9a43d3ad52e2c0a8fb2b2acd1e40d478f2cc0a41271796f WHIRLPOOL c4d0f97e398ba5315eda12cf449e0ed3b85bf887796b9f34dfbcc9696d848dac1a2cf4d6ee09f8c5d55b489eee05a7b095d0a1cb40f39870908f6ba2afb55bd4
-EBUILD bluez-5.27.ebuild 5619 SHA256 f56822cd8442ded5dc89c94506b29cdd70afdac8899fb5b93c24e3c38cab5cea SHA512 ee61f04d8ec42c70b6c4a54599387b2771988fb996b7655ba7635c867ef7fb9239c683350fb0e197b9b934803f7869e51fdfa6bf53cde5558bd6aeea797e0085 WHIRLPOOL 015831b0eca21cff9a2841238292971f7d205bd1f1aca31e07e5b9a431c5fedc4978a16b5e1971a33b5dc1ca86e5055c111acad7da3e7fc8ea278dfee414b57f
 EBUILD bluez-5.28.ebuild 5524 SHA256 e340eeb4c3e18836785f03c8ecb6a53e565b035166bbbad32ad6ea18afebac4d SHA512 a0c8fc7e9c1b27a24879f7863a5bee0c8779234118906b77d2733bf38bb15400909b9857f847a3895ba39706a4e8c79e63fe23955afec335d38eb5d7c58edf4e WHIRLPOOL 748600a273944ad097aacb10167afd951509a76a1dd4b300f52473ae7612a5f49c41f1db5c26555159b5ae8a5bdf2d26caa54a30aa343586add3be358d853831
-MISC ChangeLog 41760 SHA256 6565e2fd797401687ec21aca8572732ea0ecd92f2875238617072620cd2e23c0 SHA512 fd063fd77dfe1b66c215968914db0961ebe2f2d07b3eccabd6c267a25360ceca9614b43896908cf43187427d8fd4e76d679f83372d5f95e6ae4f74a236ad842d WHIRLPOOL 41be8ba1394e1f02168bb48f8fae089c58a126fd5b46fe4a5fd431e5c29b4dbf3d2252a7a3a239238ab7b4d42156906c5e379d1f0357fac44fe0abfc1d407623
+EBUILD bluez-5.29.ebuild 5711 SHA256 e8466746db9ebbbab4accd2b374eb44f8e8a559305d40b7010777c4ac5934abe SHA512 c5791e81a3a4f6bc4c68efa40018598a4247ddec80f777af693859bc01feef630ecf33264c429ce4ffcfa80ea58190632bbe18d2c67582d5afc333ca5aafa7fa WHIRLPOOL ac507fb747af58f7df0ccdd8cee8785fa81e0b503c774481c6f20b390bc48c8cb2620873eefb93c3a40114bbb7701433ce6a6f1818f89ee6df15206f8164a420
+MISC ChangeLog 41983 SHA256 fcfe6639a7fba9d74c033a5bbf15eb801873f980e332ef458f60234272d1feca SHA512 3498ccbd5c8e76357f6603dad39e91fa8d79dea78fff1ea91aa71a81f9b64a476930f23caddc115fa62410f457297cff1145cd9b5bbfa99e19c791fd8df8812a WHIRLPOOL 6ca92783c4b360c179291318ec5b5e79b7dfeb44ff7dc2e2bd07f2e56785afec7e76f46e4ca7e6386f68a2fc764d3473e5b510690e0043c387e1d37911bcdee4
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU9XINXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZ8sQANsSDCdd32D7rNKCNEoDIUIm
-IisVeJUhqIiJ+z6S3i/dCySnNe7hzBFHWS93ojlrEuspVyZKCEyqYB/WO0e9ywww
-U3aM/q/ljnTPomR+JqHHu5Ai2QlWPQLsms0wrChxsa37VaS01DTNjYu7qtsZo8F2
-/ZnrrxMDg1ffFbLnzcjXla8VTSHk5JUSQWCB/US4VrjzAo3DSfPAaVnvRsZFXwFl
-w3ISpcauTnbjz7smDjkr0TU0NTAgYXv/77OW3iU6mP3ROoV07bdMxf7u4T39xFnH
-gJBzVqzA0zmKLdwMkuDoJ+ziYb4indMDvgRbk833WwUQPjB9HgGCVrsip7lFdHRz
-CCTQDX84M6XmRJ22UWfwiWwKpxEAu9mWWnMU1FjI11fSdDVgLMCax1QIgJYka4vD
-oMYAnCB78sAGMVgwn9LHz8s/CsIesuwhnQfH8MFA86R6u9ATy4DcCy19V3QnXIan
-hvKxDzx2Eehss5AH1SR9eHs/FYBWlEItTlj7gIn65BqgIwCIhNWDiGrAzDxLI9Cp
-pTBTDXwdIceky+jK0LULW94sU6eDRBIpF6/yhVzIvZ01VLsqD7DJ6zPpR/JMcSrY
-VoDZsqsnCw8mC5X6QLYHTkttq25N4TVSP31dRohrMz3EOkuVBOh/usvCIvsUbnnW
-TOy9f66AQ6b6RXk4An56
-=/0Sa
+iEYEAREIAAYFAlUOxVwACgkQCaWpQKGI+9T9OwCcDs4IbxztkqDPGQZPngnY1cu8
+l84An3d4xzR+MORZitzwN++mPEjUQGC0
+=HuT6
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/bluez/bluez-5.27.ebuild b/net-wireless/bluez/bluez-5.29.ebuild
similarity index 89%
rename from net-wireless/bluez/bluez-5.27.ebuild
rename to net-wireless/bluez/bluez-5.29.ebuild
index 36727093b94698786610639f52beb03cf342c910..bc427a457ae1529a51a9eb2cdbee4bff70348c31 100644 (file)
--- a/net-wireless/bluez/bluez-5.27.ebuild
+++ b/net-wireless/bluez/bluez-5.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.27.ebuild,v 1.2 2015/02/11 16:10:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.29.ebuild,v 1.1 2015/03/22 13:36:53 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -15,7 +15,6 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
        >=dev-libs/glib-2.28:2
@@ -32,12 +31,16 @@ CDEPEND="
        )
 "
 DEPEND="${CDEPEND}
+       app-arch/xz-utils
        virtual/pkgconfig
        test? (
-               ${PYTHON_DEPS}
-               >=dev-python/dbus-python-1
-               dev-python/pygobject:2
-               dev-python/pygobject:3
+               $(python_gen_any_dep '
+                       >=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+                       || (
+                               dev-python/pygobject:3[${PYTHON_USEDEP}]
+                               dev-python/pygobject:2[${PYTHON_USEDEP}]
+                       )
+               ')
        )
 "
 RDEPEND="${CDEPEND}
@@ -65,6 +68,10 @@ src_prepare() {
        # Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
        epatch "${FILESDIR}"/bluez-plugdev.patch
 
+       # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+       # http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+       epatch "${FILESDIR}"/bluez-udevadm-path.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
@@ -146,7 +153,7 @@ multilib_src_install() {
        if multilib_is_native_abi; then
                emake DESTDIR="${D}" install
 
-               # Upstream don't install this, bug #524640
+               # Upstream doesn't install this, bug #524640
                # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
                # http://comments.gmane.org/gmane.linux.bluez.kernel/54564
                # gatttool is only built with readline, bug #530776
@@ -171,7 +178,7 @@ multilib_src_install_all() {
        keepdir /var/lib/bluetooth
 
        # Upstream don't want people to play with them
-       # But we keep installing them due 'historical' reasons
+       # But we keep installing them due to 'historical' reasons
        insinto /etc/bluetooth
        local d
        for d in input network proximity; do
@@ -180,11 +187,6 @@ multilib_src_install_all() {
        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
 

diff --git a/net-wireless/bluez/files/bluez-udevadm-path.patch b/net-wireless/bluez/files/bluez-udevadm-path.patch
new file mode 100644 (file)
index 0000000..76cd878
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-udevadm-path.patch
@@ -0,0 +1,10 @@
+--- tools/hid2hci.rules~       2012-12-24 18:46:55.000000000 +0100
++++ tools/hid2hci.rules        2015-03-22 14:29:22.753074765 +0100
+@@ -20,6 +20,7 @@
+ # Unfortunately the only event seen is the BT device disappearing, so the mouse
+ # device needs to be chased down on the USB bus.
+ ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
++  ENV{REMOVE_CMD}="/usr/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1 \
+   ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
+ 
+ # CSR devices