new release from upstream and live fixes

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

5 files changed, 185 insertions, 106 deletions

diff --git a/net-wireless/ubertooth/ChangeLog b/net-wireless/ubertooth/ChangeLog
index 625a0a0177f4..6027aaf925b2 100644
--- a/net-wireless/ubertooth/ChangeLog
+++ b/net-wireless/ubertooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ubertooth
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.20 2013/04/27 23:07:53 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.21 2014/04/08 02:36:20 zerochaos Exp $
+
+*ubertooth-2014.04.1 (08 Apr 2014)
+
+  08 Apr 2014; Rick Farina <zerochaos@gentoo.org> +ubertooth-2014.04.1.ebuild,
+  metadata.xml, ubertooth-9999.ebuild:
+  new release from upstream and live fixes
 
 *ubertooth-2012.10.1-r1 (27 Apr 2013)
 
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index aaa928b2eed6..e9d6d8dd0373 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -3,27 +3,29 @@ Hash: SHA512
 
 AUX 40-ubertooth.rules 380 SHA256 103f261d0fe795c2a461444566e486c83d9d51141fdfa4466e1739bb5b9fe89a SHA512 ddafd842c06e15384b94a1287113e3d8c1e7374e3e53f7297c6f238ca732d339509829b9c72a79a0c3e029473ad663287c5327790531ab50a5a21e5b9ce9dbc5 WHIRLPOOL 1f6f0792f4f64e7a388ef45f681d012d5522825aef8e147ebc37974e9fb84e81ca2e3c97aeeaa8f80260ad85a986dc8101baf9aec586e3ba83f08b3965ea2694
 DIST ubertooth-2012-10-R1.tar.xz 1677996 SHA256 e049d6f306c612d522c840ad296aa48b63c670665fac51425bcec2d6338ca1bd SHA512 51cf7debfe9ff2484924943484c54be38ad203d25390ddfeb242b06d1e27475763c6fdfe8706c85ed40f568c6502570289d2a04923d5e124c7b3d80359acbbd9 WHIRLPOOL dc30a1e9ad299c1c992cef1539dc5323133140d27544dbfadf44c379e9b70dddb5f5e9f097ef8e18f401a46a42da8ba359f7ae480ea821cd2a774da1e173dc6d
+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-2012.10.1-r1.ebuild 5181 SHA256 57809d384ee670c3927af390ccbb9b7727c62fa0f1b20b18de7613c064632b4e SHA512 4a3de2e170121ef81d7e68fe4fc58ef81f23d8cc3fb727b7e3e33cd9576fc342bdcd8789c3348487028a468a9914d8322b42166621fb976a60fae21623a8fc06 WHIRLPOOL 8b16f5a0c5f38ce9b3b5864bc16d7170c0364de88220398893c4f4f14532f46350b5d5d561f25702bc4193929be82669265f1d883f92fd72a627c13ef198c26f
 EBUILD ubertooth-2012.10.1.ebuild 5171 SHA256 b4fab5be9b55e809aa84320ac61fe8c582d68bcc2b6851a4b413d3e8676ef25e SHA512 206f9392830281430702bea4652fa8dcf1e2b52e39d7f2f2012d508311a22509261e1b10865edc7eb4e51b6176b7539b104e653e03832175bd87d7707153c2d6 WHIRLPOOL 02404382041f1b081c896eaaa5fd81783761a8500ebf633b8cd69b9e20ee0e3d6f71164efd3c3ca35246d2a9fad86587e22d5864263768ad29548fa8d051d6f1
-EBUILD ubertooth-9999.ebuild 5187 SHA256 e1de03cf33e426fa759c9d7ad65664cb139ea87497eba8b3095294def1d86dd4 SHA512 029eeb6715e10f3453ffb318e22a92fb23f3f39151164e544229f0aef285d129b93d22ae23aecbee209c091f754c9a94bdcb7020997ffcaea0c69cb7e857d21d WHIRLPOOL 1c123bcd97d2b10d2a9e8fa6b1dfec0d4eaec6c55087c2ee6ee1c056e899b44e8018886b2b2e0971573dbb1310775ab28e8f1052bc916a2f3e1b90c3560a2df9
-MISC ChangeLog 3432 SHA256 78c4e79a102903b1a85d01309ccd002dd65b51a3cc07051f6de862189275335c SHA512 7ed60f8e0a332b7ca1d4590530772a87023163bedcefda0d50ad74608ef07a4946807648ef1305da441909441da55716ca78282fb4e2b92c0a0e894a808f10af WHIRLPOOL 8bd4fb8d9f238c3c62d20526a0c0bae6be131e39ba6c05c772aff0de1c482db22cdb8674420f02ab018574da79bdbc61dd974472cf65e761b3b12a549a7ff188
-MISC metadata.xml 714 SHA256 de90f53e9272935b413b3986b0b2d54414ea206abac211ff111b671e85cfa4b5 SHA512 005a6d5efb9f8a2c09a1f6e74f6e4a62ff057f9dfa58911d6fed68bc9ac5f3fdc7d91d6920210150a81f7a18c9eff1cf2579fd098ecf2c6c14374aca88134c7d WHIRLPOOL 020f3b72c3aeb679a4a4f124372a3f8334ed6390a671e26ee7bb4a3638cfd53c5616ced94ac86aae5f3391b4c585fdc89f944b77e95ae2e48484cb4177d6faec
+EBUILD ubertooth-2014.04.1.ebuild 3025 SHA256 01e42b356d43142e8f8f654d4c918c1fd420fe859884d02317bf88c3e9148996 SHA512 f38469f64e77f147288443aee373a5854167db90419c3398bf17cff7847399781a795e4c6b46f5dc1182e0e0ecb3e16ba30a9f4219d08407cc7919b2e99a2794 WHIRLPOOL 392f4bd1d721787c09ee197362cdbcb3a4994cb4f8eaff15f0f15da9a067ca3cd3e3638c34fb1488e9a778eed4e2b5503fecacac4b5ea8bd7826b8adf24ec6eb
+EBUILD ubertooth-9999.ebuild 3016 SHA256 372d1cb39b37d1a296f5b67c6d17e6b9276895b64a05f7370e6ba7f51683afb0 SHA512 8e12df9b6fcef13921aa15f5a1fe3db903640f5cef1cfb3d4cd68fa93b0e1554ba4b9880171ec4dcd6d7238cf3e143b5e7448030c67b467e09a816e875dc6a77 WHIRLPOOL b5c81ab6ef6a66b2159886fa61e8b1e62d28d5f2bdc21072e15da0505a4474bf36e619e11e7975675a8a94848da1bdbd42449f6e0063856551d4fee9476957db
+MISC ChangeLog 3630 SHA256 0206d720cba0d4375a59bfe43be5d5f006f96cc318adeb0611dea58d66705360 SHA512 72fddda1be3a27953b114ba2876cfa032b93b21f97fa9de344891afc15dbe14a0f8fa9051536726bb03d9952a855d7e8122cde16ed90356fee10c15215a2bd3c WHIRLPOOL 4c3f28ec69402574f841bbdf9d9de70312c6b0f9408ad9a9daedf5b28ade9bd970ba9503effd0945d2f1069ed05588919b6403bb0e71adc002df0b3f918a1f8a
+MISC metadata.xml 792 SHA256 6364b23c04fd29b205490fd2f0b668fdbb1de2a222242aede1bffa3032de9b4a SHA512 0b19bdfb038ea9706ab6e9515ce66c2edea010ac892a8a219147df5b618b773c8aec3406525e6385c6c9823e3184852ea5b0b69c8c7f201b4ebb089c1617e88e WHIRLPOOL 4845ead4214d353520495098a0452402a9884508d8e19ac05ce49b915db5f609f02220e85d3fa74b3f54d1bc9f6cbbb7a224f468792a4c1610e419a0db042992
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRfFr1AAoJEKXdFCfdEflKepIP/Ag97J75ubkzlmP763iI3vZH
-Ovfhq2A+fVbKhyLxgiaQI9UkWKEg86KVQuBMFvLWKoVxG/9A889ThFeGt9jSOjKm
-bH55kXhoHKBktxsMBvtCwJ/1tnq5/JvoobMLH1LXsUkSBWxsPiyBeMTyDyH/5BfN
-AFBcjDfThxuYM51EoXz/6Js5IPCiokUQljhrHytWvUtXT6kX5E2X5+2TUpA+F36H
-tiz+e+gXTunqlDLW7SsbvhlfoOsBIPbZnBXWfdbTKLzZLkYOOCOFKlNltRy2sGcs
-EHqIV2JgKfmu1wav1EZm4148WspTyEErTYl04m4/RCY+njqCyMUELJg8d8VhzSUM
-5BrRO7f0Ww8HQQGoTtIHib9NULQgJbm7Gv0UYLQkkhUXmT5rddoeFDDCVw8vBuBA
-Q6XqlxuW/uiZPGwos9H6LC2MSqsb63AWWLhiqafGfxb6g3YGTVFO/RwBFcys1nSa
-pc5WlXwMwWiFxHw/vC57/jQlf9qkuAOviXLE0kkP+1H7etbmRO9UjwKd9IlRd9yQ
-RL6JR0L7cdpF+c069JqhIuWrho6NKNfg+sM+WCrug+sH3QGQZlnbJOw+CN9PS+m8
-+/vAiwi73I/vHstjNvlQ2X/y7Woub1+EaJPYUJCrCgCbpPL73hLdXW9fKpXEUx5o
-SE8tFsGuOOM4uroc5W4X
-=wPLV
+iQIcBAEBCgAGBQJTQ2EKAAoJEKXdFCfdEflKp8QP/1KsQLw8N6FnWiQ9qFIkWMMV
+B2U6QKnUoyElAbnPmpUI/g0IPO0xs9ZL8pkcCOk6N+G4WGQ4bMcsdIMmn7uI8VIP
+f62riulkVoB0Tydrnyrp2PzK7Q2t+uNCqbLn2Hav0/6w9veVH4aCLgsXwyfbYx0l
+0lbmG/5g/dJ9JeQZ1mTBItOozv6IZiC7lJdCYecno2j+zbthds+5oxbR48pC5DK6
+g3SlQ90iU7EdmeBgDfkAcfzTBQ1Q9YcGtJcDpBNZ0/VfBlazggugsK9FXz4btJ5P
+SBtCuBkUvnVJWYOQJEXqo/SrPgg0zUf8rLRTtwjFsmBMwU4gCMrJcpmgmKowg1L7
+nkFZ0SQC4JTCP6AwkJQsmT14L0If2vPeOaIDTKkScgpuDHI3B2yfMqBX9Etl1ihL
+fixHMIXM56PtundWzYivB35iZXM2ZzH7sHiyzui/YUeggKHIP57videZvlTyYWCb
+wsieDJsc+V47tBoDkf/ighbO6jr5AlxQkHMV6a+O4nFXmVVlW3gWlIK4hFgJgdFB
+pXW98XU8fSwn7Nnixu2H0HP1RqECod3fWVel3oUuM9nAfHduiPnP6K3z2P1E92WJ
+7PsifBJXJIrBI5uzRiUU4+cqrlnC1QEZPFY3iqFcs6ub5jGgxjt4twmDg6neqOjI
+K1I24LYAuZelqF9woL6n
+=fFRJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 35b8d4fc5c78..a5ca3ccec704 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -8,6 +8,7 @@
 	<longdescription lang="en">
 	</longdescription>
 	<use>
+		<flag name="bluez">use bluez to support clock following and scanning</flag>
 		<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>
diff --git a/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild b/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild
new file mode 100644
index 000000000000..c5d408409744
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild,v 1.1 2014/04/08 02:36:20 zerochaos Exp $
+
+EAPI="5"
+
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit multilib distutils cmake-utils
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez +dfu +specan +python +ubertooth1-firmware +udev"
+REQUIRED_USE="dfu? ( python )
+		specan? ( python )
+		ubertooth1-firmware? ( dfu )
+		python? ( || ( dfu specan ) )"
+DEPEND="bluez? ( net-wireless/bluez )
+	>=net-libs/libbtbb-2014.02.2:=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}
+	specan? ( virtual/libusb:1
+		 >=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 )
+	udev? ( virtual/udev )"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}/host"
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+	#re-add arm keyword after making a lib-only target
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup;
+		DISTUTILS_SETUP_FILES=()
+		if use dfu; then
+			DISTUTILS_SETUP_FILES+=("${S}/python/usb_dfu|setup.py")
+			PYTHON_MODNAME="dfu"
+		fi
+		if use specan; then
+			DISTUTILS_SETUP_FILES+=("${S}/python/specan_ui|setup.py")
+			PYTHON_MODNAME+=" specan"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable bluez USE_BLUEZ)
+		-DDISABLE_PYTHON=true
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use python && distutils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /lib/firmware
+	cd "${WORKDIR}/${PN}-${MY_PV}" || die
+	if [[ ${PV} == "9999" ]] ; then
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
+	else
+	        use ubertooth1-firmware && doins ubertooth-one-firmware-bin/bluetooth_rxtx.bin
+	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"
+	elog "your user needs to be in the usb group."
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 9a2b33a868eb..9e569b632640 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.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/ubertooth/ubertooth-9999.ebuild,v 1.19 2013/03/02 23:12:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.20 2014/04/08 02:36:20 zerochaos Exp $
 
 EAPI="5"
 
@@ -8,19 +8,20 @@ PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit multilib distutils
+inherit multilib distutils cmake-utils
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+dfu clock_debug +specan +python ubertooth0-firmware +ubertooth1-firmware"
+IUSE="+bluez +dfu +specan +python +ubertooth1-firmware +udev"
 REQUIRED_USE="dfu? ( python )
 		specan? ( python )
-		ubertooth0-firmware? ( dfu )
 		ubertooth1-firmware? ( dfu )
 		python? ( || ( dfu specan ) )"
-DEPEND="clock_debug? ( net-wireless/bluez )"
+DEPEND="bluez? ( net-wireless/bluez )
+	>=net-libs/libbtbb-${PV}:=
+	net-libs/libpcap"
 RDEPEND="${DEPEND}
 	specan? ( virtual/libusb:1
 		 >=dev-qt/qtgui-4.7.2:4
@@ -28,117 +29,79 @@ RDEPEND="${DEPEND}
 		>=dev-python/numpy-1.3
 		>=dev-python/pyusb-1.0.0_alpha1 )
 	dfu? ( virtual/libusb:1
-		>=dev-python/pyusb-1.0.0_alpha1 )"
+		>=dev-python/pyusb-1.0.0_alpha1 )
+	udev? ( virtual/udev )"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/ubertooth/code"
-	EGIT_PROJECT="ubertooth"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
 	KEYWORDS=""
-	DEPEND="=net-libs/libbtbb-9999"
-	RDEPEND="${RDEPEND}
-		=net-libs/libbtbb-9999"
-	DEPEND="ubertooth0-firmware? ( sys-devel/crossdev )
-		ubertooth1-firmware? ( sys-devel/crossdev )"
+	S="${WORKDIR}/${P}/host"
 else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
 	#re-add arm keyword after making a lib-only target
 	KEYWORDS="~amd64 ~arm ~x86"
-	DEPEND=">=net-libs/libbtbb-${PV}"
-	RDEPEND="${RDEPEND}
-		>=net-libs/libbtbb-${PV}"
 fi
 DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
 
-have_clock_debug() {
-	use clock_debug && echo "true" || echo "false"
-}
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
 pkg_setup() {
-if [[ ${PV} == "9999" ]] ; then
-	#ebegin "arm-none-eabi-gcc"
-	#if type -p arm-none-eabi-gcc > /dev/null ; then
-	#	eend 0
-	#else
-	#	eend 1
-	#	eerror "Failed to locate 'arm-none-eabi-gcc' in \$PATH. You can install the needed toolchain using:"
-	#	eerror "  $ crossdev --genv 'USE=\"-openmp -fortran\"' -s4 -t arm-none-eabi"
-	#	die "arm-none-eabi toolchain not found"
-	#fi
-	ewarn "bypassing live pkg_setup because firmware building doesn't work"
-fi
 	if use python; then
-	#I would prefer like this but we can't multiconditional PYTHON_DEPEND in EAPI4
-	#if use dfu || use specan; then
 		python_pkg_setup;
 		DISTUTILS_SETUP_FILES=()
 		if use dfu; then
-			DISTUTILS_SETUP_FILES+=("${S}/host/usb_dfu|setup.py")
+			DISTUTILS_SETUP_FILES+=("${S}/python/usb_dfu|setup.py")
 			PYTHON_MODNAME="dfu"
 		fi
 		if use specan; then
-			DISTUTILS_SETUP_FILES+=("${S}/host/specan_ui|setup.py")
+			DISTUTILS_SETUP_FILES+=("${S}/python/specan_ui|setup.py")
 			PYTHON_MODNAME+=" specan"
 		fi
 	fi
 }
 
 src_prepare() {
+	cmake-utils_src_prepare
 	use python && distutils_src_prepare
 }
 
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable bluez USE_BLUEZ)
+		-DDISABLE_PYTHON=true
+	)
+	cmake-utils_src_configure
+}
+
 src_compile() {
-	cd "${S}/host/bluetooth_rxtx" || die
-	emake \
-	clock_debug="$(have_clock_debug)"
+	cmake-utils_src_compile
 
 	use python && distutils_src_compile
-	if [[ ${PV} == "9999" ]] ; then
-		#cd "${S}"/firmware/bluetooth_rxtx || die
-		#if use ubertooth0-firmware; then
-		#	SVN_REV_NUM="-D'SVN_REV_NUM'=${ESVN_WC_REVISION}" BOARD=UBERTOOTH_ZERO emake -j1
-		#	mv bluetooth_rxtx.bin bluetooth_rxtx_U0.bin || die
-		#	emake clean
-		#fi
-		#if use ubertooth1-firmware; then
-		#	SVN_REV_NUM="-D'SVN_REV_NUM'=${ESVN_WC_REVISION}" emake -j1
-		#	mv bluetooth_rxtx.bin bluetooth_rxtx_U1.bin || die
-		#fi
-		ewarn "bypassing firmware build because the resulting firmware fails"
-	fi
 }
 
 src_install() {
-	cd host || die
-	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 bluetooth_rxtx/ubertooth-scan
-
-	use python && distutils_src_install
-	use specan && dobin specan_ui/ubertooth-specan-ui
-	use dfu && dobin usb_dfu/ubertooth-dfu
-
-	dolib.so bluetooth_rxtx/libubertooth.so.0.1
-	dosym libubertooth.so.0.1 /usr/$(get_libdir)/libubertooth.so.0
-	dosym libubertooth.so.0.1 /usr/$(get_libdir)/libubertooth.so
+	cmake-utils_src_install
 
 	insinto /lib/firmware
-	cd "${S}"
+	cd "${WORKDIR}/{PN}-${MY_PV}" || die
 	if [[ ${PV} == "9999" ]] ; then
-		#use ubertooth0-firmware && doins firmware/bluetooth_rxtx/bluetooth_rxtx_U0.bin
-	        #use ubertooth1-firmware && doins firmware/bluetooth_rxtx/bluetooth_rxtx_U1.bin
-		ewarn "bypassing firmware install because the built firmware doesn't work"
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
 	else
-		use ubertooth0-firmware && newins ubertooth-zero-firmware-bin/bluetooth_rxtx.bin bluetooth_rxtx_U0.bin
-	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.bin bluetooth_rxtx_U1.bin
+	        use ubertooth1-firmware && doins ubertooth-one-firmware-bin/bluetooth_rxtx.bin
 	fi
 
-	insinto /lib/udev/rules.d/
-	doins "${S}"/host/bluetooth_rxtx/40-ubertooth.rules
+	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"
 	elog "your user needs to be in the usb group."
@@ -146,15 +109,6 @@ src_install() {
 
 pkg_postinst() {
 	use python && distutils_pkg_postinst
-
-	#if use ubertooth0-firmware || use ubertooth1-firmware; then
-	#	ewarn "currently the firmware builds using cross dev but is completely"
-	#	ewarn "NON-FUNCTIONAL.  This is supported for development only."
-	#	ewarn "If you do not know what you are doing to NOT install this version"
-	#	ewarn "of the firmware. If you ignore this warning and break your device"
-	#	ewarn "you can find repair instructions at ${HOMEPAGE}"
-	#	ewarn "You have been warned."
-	#fi
 }
 
 pkg_postrm() {