added upstream support for clock following an existing local bluetooth connection

Package-Manager: portage-2.1.11.12/cvs/Linux x86_64

4 files changed, 35 insertions, 22 deletions

diff --git a/net-wireless/ubertooth/ChangeLog b/net-wireless/ubertooth/ChangeLog
index bb7a9bf04499..954e765ba24f 100644
--- a/net-wireless/ubertooth/ChangeLog
+++ b/net-wireless/ubertooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ubertooth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.9 2012/08/26 05:45:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.10 2012/08/31 03:55:07 zerochaos Exp $
+
+  31 Aug 2012; Rick Farina <zerochaos@gentoo.org> metadata.xml,
+  ubertooth-9999.ebuild:
+  added upstream support for clock following an existing local bluetooth
+  connection
 
   26 Aug 2012; Rick Farina <zerochaos@gentoo.org> ubertooth-9999.ebuild:
   svn->git plus various python build related fixes (thanks to Arfrever for being
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index ab8a81582799..1ea8c22446e5 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 AUX 40-ubertooth.rules 380 SHA256 103f261d0fe795c2a461444566e486c83d9d51141fdfa4466e1739bb5b9fe89a SHA512 ddafd842c06e15384b94a1287113e3d8c1e7374e3e53f7297c6f238ca732d339509829b9c72a79a0c3e029473ad663287c5327790531ab50a5a21e5b9ce9dbc5 WHIRLPOOL 1f6f0792f4f64e7a388ef45f681d012d5522825aef8e147ebc37974e9fb84e81ca2e3c97aeeaa8f80260ad85a986dc8101baf9aec586e3ba83f08b3965ea2694
 DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10
 EBUILD ubertooth-0.0_p534.ebuild 3150 SHA256 118852488e3a4f2fdf942a4b8b308d95487e2832a362cc7f67e02d2dfec57203 SHA512 f90e96dd588ad8fbd47b1908514c2ec4a33fa9bca77b2ea0e8df0b0480ae286a920bb4170732cfe1f0f37eb6af383b47c7bad1c855d4b38ceb264044d7a3d961 WHIRLPOOL cf953fa68094ca885291a993e2a2399eec720a9c4d6bb7ea4a8b01c105f99a7ca3d0c673de96ef7b8080b3444835e1d2203a8ebb8e394751ea63be75433b7459
-EBUILD ubertooth-9999.ebuild 4528 SHA256 b83daaebc40f37d33bd6c377ba11939ad467016f09dd6a490229154779a9d632 SHA512 f1b54e0b64d104ea0039b605ac2250f89f270ffd72dddd7276ae9d0750395f7df707ac8c6f3d8ee2164726d782991f4d6069d7c72f263f90d9fbc1b995483470 WHIRLPOOL 1f0b5793ad6f6bd45b3349e0fa57570ee92837ba2c956dfe72f90d84b55633d44069183d7968237197f118d676eba4e4e6a698704f60d611b2dd8465959ec69a
-MISC ChangeLog 1775 SHA256 c1fb919e2fe6d36c810de2cccf4bfec2abfa925262b97a1421b9f02b4013edaf SHA512 dd3f1d0ea71b10c38915ad293c1169a4b84ed6c9fd4d517e59669986050b5f8d301a79c3c64f81c234742d459e186d39f0f87a76612b6383ccd81eef98399eb5 WHIRLPOOL e440ac2385d122143c9fb5a092a01048970452b35e1683aacfe1e9583fd045845a711d80f31c9fc8fd90d499b38a2d2f0b2be8e167769570001f2738ed179d5d
-MISC metadata.xml 602 SHA256 81fe17f8522e7ba143bf27d12cf487a2b28340aa1119bd70e4222eaaf10b6419 SHA512 bde8dcd6cd8766fd0c544913ac625a00c83d9757b9dedce72b55fe137e27d8a83af3a3bc21ffe6ce5d4d658683e19a6f677a1c345deeeab00103a03c2b199d19 WHIRLPOOL 514f715b4bf29315d199580ff391eaba2eb72984ceb38bd380936f730fd874c8e8905fa88bb8d9b30f87a1f5a2189357cdcca8fce8cf8609ff4e90afc585b2e3
+EBUILD ubertooth-9999.ebuild 4754 SHA256 62efba86d8b642754c02cd038c037e49e2d34d74a2652bf2fb2ab2c00e3154d9 SHA512 4654ef5eed430a4dedba40b3172b9d3ff6ae43d12f8411ef91917d53b22a3850ee9f3601e99e18481374e55e09b803e8e2da59247e0a93647f275d33ad0835c4 WHIRLPOOL 8068d90c953757ee589977c7590c892478038807db3a385f3dc5e0a3a874c4308e8ab5a1a1288f360aa4217fe20964e8e183a31d4475ca50fff9d215e80830f0
+MISC ChangeLog 1952 SHA256 0d7815b400c495c139a9966339d3d59576c3f69d47a63277fba10024f5dc94d5 SHA512 d3bc95be3c6cb26cdf5dcfa5cba6ff8a1617bf87bb65f2fce521a7139276d825aace7488074e074741ccb24adbb360b0e0d98c9f19442e214dda70600d9fbaae WHIRLPOOL 2e8f2a5280367cdf8ae2378c30f621bd87f80e4dd285184903d65e0130e9fa650dc395344ce95faf02d8af7a1f1829c0b8fe9c851d549de84b02199c9d4ada21
+MISC metadata.xml 714 SHA256 de90f53e9272935b413b3986b0b2d54414ea206abac211ff111b671e85cfa4b5 SHA512 005a6d5efb9f8a2c09a1f6e74f6e4a62ff057f9dfa58911d6fed68bc9ac5f3fdc7d91d6920210150a81f7a18c9eff1cf2579fd098ecf2c6c14374aca88134c7d WHIRLPOOL 020f3b72c3aeb679a4a4f124372a3f8334ed6390a671e26ee7bb4a3638cfd53c5616ced94ac86aae5f3391b4c585fdc89f944b77e95ae2e48484cb4177d6faec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQObijAAoJEKXdFCfdEflKFnIP/1bhLui9AKAiHUta/BooncXZ
-2vMTcs76JKJWUwNZ3mkPP6BDOkEad5ZTEdjqxgE/5ic85VYI9mYJHInprsLWSmoG
-/MA2mCi4Nj6a+XOWvIVyp7kVi1zzVngUxw+IuzFywmiiLZ+tjssfeWmg7x1msCX+
-FsxzEqBcrrpxfUh/uz7My1xqNP8l6yQ7zxU9UMvFEgdhL/9SpTaH5ME2QiKinEgi
-Uh+JqoAIaF0Ro5ao9F/VQnJ+IhsjdLlcRU9zIheHHo4IKK8cksAu5BX4FW2ES2Wh
-0eF4RY6lqOx5Am8nVoi3MNzjwsrlPuQIQ2RTQURrWnj1JelRfwEMzv7EomoqXyY/
-J6ezdh0lHdLix3hAF9EJkymwPoX6/Z0tITrFQh3BTBqgKbBjX0ha7R9ghabff+eY
-+FUragnzr2ZTXpdo5pr2woyxQZnP2cKX22eFWn+jn+xMUiRTp+nyG79gNihKl7hf
-3hgt2ZIp6W2YTs5+7mJi+afBxPBH2TjcriyKo4Tvk7CPf9d2sbY6lavprl39bTbR
-x5yZZHmSQyNypIt5eeTU4jbtI5EMVG5ENVzeZpgoBUvsPmS8Uq+sguDGLQVFAfiJ
-p9Xk1HrTSR8o/ajKHRBvvBHhp+XNKuyL7wd5ff+PINjwBYhJEyBB6Zo4D70V5/Sj
-f07/K3IWotVZHBuvJROV
-=ITYI
+iQIcBAEBCgAGBQJQQDYoAAoJEKXdFCfdEflKX1QQALqhWRRCziOc3t3wdP0f/AMA
+Xuzt5wSuYpKkmoFz3G5l+2PR+pQpygl2p/HyZpWT1/Oc/7nQ1iDaCee7O1FrXZvn
+LTSbHka92BvdRn1Q/UeZ5NPKTNWVKEVXMnUe5i9RBrbs9u3l/0sbVmHsAqfWZlg/
+s7LFq3ecuCg0TXyA0sNcWvu/aVcqXtH/XKs3O1tgADGntwApkRDmqm1ijGNxqenG
+l4zhJOfva5WKZwv/6/DBYZIru2PajO5woEJMejgU0+iFCfgKezUjosKJZ+/x89jQ
+Tgr03KSabJ7ppkdiNDHX5k1VdKmuuKRlNMZw4xvaAyExzOunHsUrBPQXHCKpGmU4
+8etUFzunBQzPt5BngUSQsc4rkXw8agZiQGMasJ6y0aAS9+XHXtE+MJqjprJlsAh1
+Q9t+ouXoRDuuyk5NO0Uzy5UDGvuVqnOcdg6A2CwDDtTARijkDankffQ1zZrIYrfs
+aSIaVaD1hGmZgsCivDCx5kGJzrIjPla60j7gmcrNFk6SLX25dsxFHkHes9ygO501
+caKPm6VI/CmZZ5laoRAlG+mliS2PXvlTsvCP2CcwVLYqEEKcUf0fgVyKCzFmAn1W
+rF7iUPce3jbTJCjBiUEVpbIZOuB2j3RQjS20hZIDcLhYoWOSKe9009cGmJlzuekl
+78mcnWeQzqh3SagkyFWv
+=VmER
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 9c73c03cbc28..35b8d4fc5c78 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -8,6 +8,7 @@
 	<longdescription lang="en">
 	</longdescription>
 	<use>
+		<flag name="clock_debug">support for clock following an existing local bluetooth connection with bluez</flag>
 		<flag name="dfu">Install ubertooth-dfu (needed for read/write of firmware)</flag>
 		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
 		<flag name="ubertooth0-firmware">Build/install ubertooth0-firmware</flag>
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 69be87656ec0..05698a0f6415 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9 2012/08/26 05:45:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.10 2012/08/31 03:55:07 zerochaos Exp $
 
 EAPI="4"
 
@@ -14,14 +14,15 @@ HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+dfu +specan +python ubertooth0-firmware +ubertooth1-firmware"
+IUSE="+dfu clock_debug +specan +python ubertooth0-firmware +ubertooth1-firmware"
 REQUIRED_USE="dfu? ( python )
 		specan? ( python )
 		ubertooth0-firmware? ( dfu )
 		ubertooth1-firmware? ( dfu )
 		python? ( || ( dfu specan ) )"
-DEPEND=""
-RDEPEND="specan? ( virtual/libusb:1
+DEPEND="clock_debug? ( net-wireless/bluez )"
+RDEPEND="${DEPEND}
+	specan? ( virtual/libusb:1
 		 >=x11-libs/qt-gui-4.7.2:4
 		>=dev-python/pyside-1.0.2
 		>=dev-python/numpy-1.3
@@ -52,6 +53,10 @@ else
 fi
 DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
 
+have_clock_debug() {
+	use clock_debug && echo "true" || echo "false"
+}
+
 pkg_setup() {
 	ebegin "arm-none-eabi-gcc"
 	if type -p arm-none-eabi-gcc > /dev/null ; then
@@ -80,7 +85,8 @@ pkg_setup() {
 
 src_compile() {
 	cd "${S}/host/bluetooth_rxtx" || die
-	emake
+	emake \
+	clock_debug="$(have_clock_debug)"
 
 	use python && distutils_src_compile
 	if [[ ${PV} == "9999" ]] ; then
@@ -102,6 +108,7 @@ src_install() {
 	dobin bluetooth_rxtx/ubertooth-dump bluetooth_rxtx/ubertooth-lap \
 		bluetooth_rxtx/ubertooth-btle bluetooth_rxtx/ubertooth-uap \
 		bluetooth_rxtx/ubertooth-hop bluetooth_rxtx/ubertooth-util
+	use clock_debug && dobin bluetooth_rxtx/ubertooth-follow
 
 	use python && distutils_src_install