update live ebuild for new udev installation method

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

3 files changed, 35 insertions, 31 deletions

diff --git a/net-wireless/ubertooth/ChangeLog b/net-wireless/ubertooth/ChangeLog
index 4aed79f774f1..4b28fcf2304b 100644
--- a/net-wireless/ubertooth/ChangeLog
+++ b/net-wireless/ubertooth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/ubertooth
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.26 2014/08/26 01:33:17 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.27 2015/03/18 18:37:24 zerochaos Exp $
+
+  18 Mar 2015; Rick Farina <zerochaos@gentoo.org> ubertooth-9999.ebuild:
+  update live ebuild for new udev installation method
 
   26 Aug 2014; Rick Farina <zerochaos@gentoo.org> ubertooth-2014.04.1-r1.ebuild,
   ubertooth-9999.ebuild:
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 6b293f53f2ec..699e2be0ab4f 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 40-ubertooth.rules 380 SHA256 103f261d0fe795c2a461444566e486c83d9d51141fdfa4466e1739bb5b9fe89a SHA512 ddafd842c06e15384b94a1287113e3d8c1e7374e3e53f7297c6f238ca732d339509829b9c72a79a0c3e029473ad663287c5327790531ab50a5a21e5b9ce9dbc5 WHIRLPOOL 1f6f0792f4f64e7a388ef45f681d012d5522825aef8e147ebc37974e9fb84e81ca2e3c97aeeaa8f80260ad85a986dc8101baf9aec586e3ba83f08b3965ea2694
 DIST ubertooth-2014-04-R1.tar.xz 1762456 SHA256 0881b4bde755acea557851852bc830c100986801148ac1fcaf8ca898623edfaa SHA512 9cc415c7e7f4ce40703e7dcf916e8942325902ab3af470fb959de6bbe047a824ad62b41a09e95ead5a74a961674d2dd4d30e582db21e2ba47f648eb99462bf4a WHIRLPOOL 6c01402ebf004e782bbe4ad891c3b8ebee0040a5bfb6fcdeb2939a105646157b1786b90772a502b92e26a356a5674bafd6960ce83e3f81db819dd5575e6fc444
 DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10
 EBUILD ubertooth-0.0_p534.ebuild 3146 SHA256 8833b94bfe8e4b42910300207f48db53a5c088236eaa4e58c7d2b860c28cde54 SHA512 f53a0b2cdead288a5cb41721cfd933dae8307d3eb2f41c875a68c013a59a4733b299f3f041654f2074c8c4808e3787e0b97994662563c38afb89108202ca66dd WHIRLPOOL a3e66d0743063a088901f53be569d0d2d4ae8c21c68b5bcb8f0733cf44570efe4cc11e4f44709e6e9e2b4de7c56656f2b80722a07857b7b8dc76213f7c8c4c6c
 EBUILD ubertooth-2014.04.1-r1.ebuild 3071 SHA256 3231343ba17039001dec14ef9fdb2110373c42f9ccb03b944ce511940831f727 SHA512 ebc80265a2dfa97554091d48ddc1f5e1c860989f65a5af37d3e7d52701ac4ec3d952b9a63c0f9c639f184b353966b806b1cadf8fcb51b6256bf33b930dcd98db WHIRLPOOL e39ae101af16d58845cd35b6e82d45e81d3fc088dfe4adbfbab50853eed40c5e4fd2a57303b66271f38296d166ae6564d04113468080fab490234bfb8fc7ae5d
-EBUILD ubertooth-9999.ebuild 3116 SHA256 863e01566e3ef2070233848816aa25287db8cd544eb2e5e76169a455a71fa991 SHA512 4931ddfb73d7369ef1d0eda93291bc638da5acb44c47350a3104f71203b3862dafff05b1ab43e8d74285e4938c0844954c81f25c30efe90c07591c1beb4fb97a WHIRLPOOL 19c87ac7d9cde9787d9739530c3d8770227055365dd701416b8c0d600571b08dae9b3773600cd51725f91a8fa50865ba6cf12e28dc1170b9d4c9a6a3145e2e28
-MISC ChangeLog 4516 SHA256 e78742a8ba9a674c78a876f0714fe1aec25084f95fef6702503bb2f89370fe0a SHA512 d8b328564c146b4ecd7fba3f01aa0b4621ae2a57fa420b7c7b9e765bcfccf5ac11ddc93821286e5b6bc4a81cadb8c7aaf68bbc2160bc4ca774e3f713012529ea WHIRLPOOL 7872f78983a8d1bab84fe35a4e317eb36637ff4b9b860d6f8c7b32431089b0982c8924db9d74b5fcd2ff36b7b3ad86310cf5580735c1845d485623f32a49f641
+EBUILD ubertooth-9999.ebuild 3177 SHA256 7c4518aa7f3faf80eda1d22c93c633c34e4ad441e695aa79991251c8368abfea SHA512 f64aced8fd133ddbb12cffddbf828bdee4ef36cca0f9d9b74b555bf68bb8deb504adb9d30ff72ab277a30689d35fd8cce9bab7ed699f72ca4dc5fb3646b44e82 WHIRLPOOL cec486b55b37c9710b7e612904ceec5fd0677c38b6c5bc76166b036b709b82e6baf99acd8aba7f79bee50bd876b8af1c33a2646b5c303949eb7898740d463b88
+MISC ChangeLog 4644 SHA256 d521cc71f70a95c2ba9f1d30ca0e0a9fd67588c1a69671b107ec4938eee251cb SHA512 59021f9be2db0bcdb407eddad100042b9f50bb6fdce9be24f47e86210dd014328726a8dbd4b74737c2e233e7136cf516853d673303cb0b51dd0dba0f2880e8dd WHIRLPOOL 55d83c8653f616d86a3c51dcb8af88ac0999ff24831c12e1d4543625452678843b37125ba391152d52f493b40e0ce25894a80849b331b4425e5f389fcdfa63c0
 MISC metadata.xml 753 SHA256 e3b7faa33746664cf24f317a0f76b56d4d2f410e11f4a7bb2f20eeeebb5f4787 SHA512 c0716724de8eeac4caa55fe224036b9b6b8ec8b8bd81f6e61365b83a7a51ce0a8d500b99b216af79da507ace24238b551cf4a61c38c32f86a66bec75def46a79 WHIRLPOOL a4122aaab045cea78cfcd592c40931dab667ae1efe1fee1f62a4247bb582956d1262010e442f1c6fa57afd20f755af63ff4f52a2ef51ecbe3f5b615b0caa71bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJT++PsAAoJEKXdFCfdEflK7ZoP/AjLi/U0yTD+ZZZCkQ1oLGv2
-IfL6TVFWEcN0bbwPqkY2NszSBYnYiX8xg4HWZ07KgVv1D8k06Q8QLmqf/qw46nEs
-mRWV11aYM/MSGYBql8e0qCDnDltOiGt7gY+CgyENUToBndMU47iVLKeeR6QE1P1S
-KNKLuMJnPCfiyPJ9dWcUJEeMkIKWy4S5PAWd6RtwWPLZUkydg/lULBxYHv6YwfRX
-rw8V8C9y+cGJsz/d2ZGwIUvXZuzPmSiFN4xD+IL3p/IhpWT7kdBUK+9Q2kAcE8+I
-LoQo1+DL+w9St934i3Cb4aHggmDETDvPfsQKW85eFRQd7MeC5zHBqTl8Pqe5CZzK
-KEzNV8MuvUZgnukjCqG8cx7Snc/W1mp6CsEcD1bsfQIYKUL9nmDL6cnNCgbmekqH
-7sd9a0bAI5pePpmo5+DqppZMFNalCV8tjLeNCrp5mjnxFovxwyKJHDWIuCcsibc0
-tj+l+ZZ2q/2dJ0cdhrE1L80I7XQSmtJ9c6iVrdhvKHOsdAmwR9+Z4CFNuX+DSyhs
-pha8kls4fnnjNRzGGdAMz6kjOqdnbv6vN2by7I+tOv2sQ/QEIirwhh+O4k+VIb2J
-4maXmDLk084M/iYnR8GGHPsr74thaSTuh53r4aHIHs2zlJCSoAorRN+aNwXeFnio
-yS2MvlzrUyEWCwAI872+
-=VNSo
+iQIcBAEBCAAGBQJVCcX+AAoJEKXdFCfdEflK+RgP/29gtD8nBsTVzKhFScI9k2T/
+YB3WC3rhja4Z0pKBMjkAOo4FKlBgaksjFWwnCG6/xsBTJT8CZtNapaQ+kY0Mr9PY
+fBYAVIa0RImJ1GUes/UXMwpVVFzLc6TsaT2A1JZbpU8dm/wBgWLcvtUBxuoe+hz/
+jxCylUG1lRuEULGgFvGfG9rHP521p8ei6b5ttnGi0OLQlEKmdrFeKtzxxSJxFip7
+lxq+otzwTsFyVpvTKlF9cWaOH2uDBjqrsyEXasdb6d4cN8wS92aMK0vWdsI40TMK
+oHfSgoGaTlYT+uOV7hXcQ7fKHB8zgG94wKdQpJ+vntUlC5+MdRRxxBmyIDV+YfOI
+S90Ls5QXoo5zgy0DwvDVwWHFnUtDIxh90lyHOrC+YPhQonMyDPhZ+5rZTnhwkh7u
+/ilJuLeV6x6v7mX2FTivPfAkwX0OAvFw2GXinKz1At86t5f2Sn+NtVvsWiobOVBE
+8fsSITdMZ5hrfudWuXKepVlZm1hNWcbAGVVLR/QOokfA2FPkoZ7XMjVDKMzgVh7+
+GDCyP6IbVJGzzIVt9WSpM1TzGdSUAP8ZUbBdVIq5adshc63cz16UJamRHT3mE49H
+I3I+Z8kR/b07jNqUjf09n8TuYt5vNiiRjztApvXqc3uLsSUf35TDOCp6CklvoRj+
+1xe/2gOILDw0Jva0JnKT
+=DdcZ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 90f24857988e..957b8a83bcee 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.25 2014/08/26 01:33:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.26 2015/03/18 18:37:24 zerochaos Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit multilib distutils cmake-utils
+inherit multilib distutils cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
@@ -21,15 +21,14 @@ REQUIRED_USE="dfu? ( python )
 		python? ( || ( dfu specan ) )"
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=
-	pcap? ( net-libs/libpcap:= )"
+	pcap? ( net-libs/libpcap:= )
+	virtual/libusb:1="
 RDEPEND="${DEPEND}
-	specan? ( virtual/libusb:1
-		 >=dev-qt/qtgui-4.7.2:4
+	specan? ( >=dev-qt/qtgui-4.7.2:4
 		>=dev-python/pyside-1.0.2
 		>=dev-python/numpy-1.3
 		>=dev-python/pyusb-1.0.0_alpha1 )
-	dfu? ( virtual/libusb:1
-		>=dev-python/pyusb-1.0.0_alpha1 )
+	dfu? ( >=dev-python/pyusb-1.0.0_alpha1 )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -74,8 +73,15 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_enable bluez USE_BLUEZ)
 		$(cmake-utils_use_enable pcap USE_PCAP)
+		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
 		-DDISABLE_PYTHON=true
 	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
 	cmake-utils_src_configure
 }
 
@@ -97,11 +103,6 @@ src_install() {
 	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
 	fi
 
-	if use udev; then
-		insinto /lib/udev/rules.d/
-		doins "${S}"/lib${PN}/40-${PN}.rules
-	fi
-
 	use python && distutils_src_install
 
 	elog "Everyone can read from the ubertooth, but to talk to it"