move firmware to appropriate location and ship the dfu image instead of the bin

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

7 files changed, 34 insertions, 353 deletions

diff --git a/net-wireless/ubertooth/ChangeLog b/net-wireless/ubertooth/ChangeLog
index 4ddd8d66b266..632592313ef7 100644
--- a/net-wireless/ubertooth/ChangeLog
+++ b/net-wireless/ubertooth/ChangeLog
@@ -1,6 +1,15 @@
 # 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.24 2014/04/08 13:45:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.25 2014/08/25 17:42:12 zerochaos Exp $
+
+*ubertooth-2014.04.1-r1 (25 Aug 2014)
+
+  25 Aug 2014; Rick Farina <zerochaos@gentoo.org>
+  +ubertooth-2014.04.1-r1.ebuild, -ubertooth-2012.10.1-r1.ebuild,
+  -ubertooth-2012.10.1.ebuild, -ubertooth-2014.04.1.ebuild, metadata.xml,
+  ubertooth-9999.ebuild:
+  move firmware to appropriate location and ship the dfu image instead of the
+  bin
 
   08 Apr 2014; Rick Farina <zerochaos@gentoo.org> metadata.xml,
   ubertooth-9999.ebuild:
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 217830c32f80..ddb2f57dd5a0 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -2,30 +2,27 @@
 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-2014.04.1.ebuild 3029 SHA256 512d6cfc2c11339c2b5ab1aa2af954315ee9974dbd31e207177f44fd8ad5e76e SHA512 b0f48b2fdfdaa7d79dec99cb0bdf5c78cd8d0ed525ceb5ea465b576438299bfa011ebb78ed1a9e65bef3a2e1bf3b4333d7bcfc5c6e605e299f70a69a1944bc6b WHIRLPOOL a35687ec5a2e0715fb22cceaac161deb1bbd0e121c5d17b2e1614d36d27558b7d8079bde7b37420b3247c93d455e0f32463055632954fd4884626535c3a4e42d
-EBUILD ubertooth-9999.ebuild 3077 SHA256 bf6f66593832d6351763da216fa3ffa6919856189a4f07c35b0c279159995282 SHA512 117cfc1958e8d680e9c17679629a0b27f7b72f72efda2fba2fdb018dcd49d6f13fa4683fd3284888d72252e16df0ab26f8399afcd7801e05f1bc3d7956b37b71 WHIRLPOOL a405643b47fb1e474fc01283924d060ec4d6ab626eb1faee2eb89498334a0e9d9b686bbdd5638f12307b83d9f79442e98f3cdd6a66d83129d3af6c58f9f0df5a
-MISC ChangeLog 4033 SHA256 1f0a5767bd2a1f13349f6c4fd9ccf4ac5d3457c2e66694c72b264426f77df18c SHA512 dd7d51f4d11e8ba093c0062796dde736397244ac50f9db297315df1289cfc7a655c309bea28d9d0cccf9d3f0e9be57f928c8564f3c26db1762cf32c3a89092d9 WHIRLPOOL d5252eda31ca2c059a198959036dac558037396ca2968323902622ad396da657bf7c374ba688e6c6749a58f11fa051f43659eff1d8fee30c8d26841bb47ff794
-MISC metadata.xml 865 SHA256 ebb96c24879d3226c4fe1598a4fabe614f8ca563633ae3d50fc79632b39ed9fb SHA512 d0093d893b6a3a6316e617ca222f8a26d7ee848d93053d447e7d784c5ac0f8aae795c03d32948ddd1757fb21e7c8c684a72e6d42c168270e4cf46365044211f3 WHIRLPOOL 382db5d4a4600f9051465902f556ee6c3e704b7f8bbb8870c7b692bab853a14186d002f6319e09bfcc162bebbcb00dd4e395ca8af722220e65f8e4e89277fbfd
+EBUILD ubertooth-2014.04.1-r1.ebuild 3051 SHA256 fd1590a57dd0f9e014af1aaf1c94fb71a7e1a0427fcbd789fc9032df8004f39e SHA512 4d812a8e741260d617ac8ecc3882e8b7ed289a26c5ecafa731227f152c563a9d0b4f6aeabb1508741e11b259bb62a70c2b5b89a58be0520d5d0814a585b4fdb3 WHIRLPOOL 004d5f3ea6bbe6a8b74a4a7dfb6a1465e12acc527ac14e3ed10271a7a088dcee4ceba3dec39a6a24b5d4fd5deecd41c2be3dba26e2024a108f9a0e7b107a2f8a
+EBUILD ubertooth-9999.ebuild 3096 SHA256 8ab5594d4484e694a5f507c207afa1ca5ecd608411770a397f3df80cffa7f493 SHA512 25e7b32f3e76daf9982ae016ed3f20df1b668be54478713e7750ae0fb8d73a50e672aeaed8cafbb978ee7e7057c49f45c4871a1ddc0b875c036a4ca9bf5b470a WHIRLPOOL f2faf1c87b84a6fd001de4a3b4c88edb5d9a58fd0ca4dd5f801ec59351948d52410af02e60fe6c24f4724b81996b73617aa1b5b1291afd29d67852066e6cb6ff
+MISC ChangeLog 4372 SHA256 5f27536af42c1b36f260e2309537918c99ec28f05118c3ba9af1b719be4d1327 SHA512 e12320f31e08d026bcfbf6db75328e7ee3ba583e540f3d5eef4d4f2ee3308b8b5f4eb567daf81aaed4760f5bfe539e0b7713c1755c7dc8a421f911ab00ac7b2e WHIRLPOOL 25b603269f369ae52a511ec91abcb46ac3b3c9625fd644bc34371b75c4153c98fff66a65fdf169013eadb907af050fefdf48a5ee7078cc10709a5d99c21f91e2
+MISC metadata.xml 753 SHA256 e3b7faa33746664cf24f317a0f76b56d4d2f410e11f4a7bb2f20eeeebb5f4787 SHA512 c0716724de8eeac4caa55fe224036b9b6b8ec8b8bd81f6e61365b83a7a51ce0a8d500b99b216af79da507ace24238b551cf4a61c38c32f86a66bec75def46a79 WHIRLPOOL a4122aaab045cea78cfcd592c40931dab667ae1efe1fee1f62a4247bb582956d1262010e442f1c6fa57afd20f755af63ff4f52a2ef51ecbe3f5b615b0caa71bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJTQ/3HAAoJEKXdFCfdEflKpyQP+wV+2+OIIA5UtvA26r2q8Zr7
-VGxha7s0zgOktAOKUAGbn6ZEIGlsl29VwO2IZUwb/+G/Zq1stWHDJ7DvpM+jPUyR
-oU58g81cEK93AiWOI+GuHnHgrypEG9crOiE1WTjNqD++K6n+spGh22RMeEF6yzJS
-xd/K8eeJJbi4+6TTj43SWg6gxxtOb7+Slp3KAUGLgoZl9MXINo3fjCA8JbmeGK4R
-AbonzTeLmyflzCy0B76lull3H2q5d28zLs5VOR4/MAxI6tcH/7hOTs5fYagpinlz
-e+bYk8JT7goJH1bgJv+ye2+pBpmFYibP5ReaVY3A2yIG/16ox8LNV5iFv41tiSjf
-8Zeb059RtJ29xibuL6uUKDKuoih8gd7ApKGrTX4ifHeWepURF3gzqw3ZXC8+kkI7
-0y8YfeCEcnPLfIYiwyHoUHS0r9aoNebPjs7RZ4FAa90h1dOYHKej1ADDp2gQyEGT
-zFgf7LZsg2xKPHAXnBvkqVxQwdLgJloMy6/EHhDCI7cDV0TipRvzMsQQOMRwnN9c
-NeGoc3AH+x24GCWcnOUPootskOXJYpSJd6DvuU1WBZkDILOnOoF3RqyDqk4SISA8
-F0bNUegdDZe6hvyVOe596Urxc/RLF9m5B4+VgeZ2fVvwRHCs1ST3TjSYh/fItlTc
-87h1/Fjy8DElOo0qaByh
-=5jKz
+iQIcBAEBCgAGBQJT+3WJAAoJEKXdFCfdEflKx3sP/iPmmVcmkK/pJnJzF3iAL3Ga
+s9vOuIC0IWbYzpZuuuOpi+CfbMXFBcwmZUiW/UJlmWAX6LvZStaGHNNps8jaIRjT
+d5vA7fGipyzV0BUNzS6XYtHggJGdK/HUwkhTAsIpploAS0J7h0hURSdXKDuh7cFY
+gGL3FnRzXHErcQWGmsUSOVXaF4gUOGo4dtPuCxItbT25bBpIPrp+KPnr81K1Ziiy
+xKJdu030TEkYoqAkgMnoY75SmgvqG0dQEFnOuvBNZtZsz1swh/W43Ocralhf+Sov
+EG2CVf7esCbnewo7uBc19jYIPPqD0JMZBjihRkkoj7WDlZtKywmAEdjFYZKnXqUt
+S4RSzhAEPhJ3l6DlnA17HpcGwqdodnCEC2hEcMWMRw8sTY8I5FW8aU/BjHqj7hGp
+1gonT/Txdvu8nNpeYFNwgKYwQFfbFGfkCbw2oJpAyNAP1v5DFamsPLfXrXwblfdu
+ILEpG7wTAK9THCkTOKdB1Bq8o7rIbHnt1XLcRBk60bc39LB1s0xh1MOLe/86ryMK
+H2NBlQD8bB/naoqZIPSmtZRGKd+Bl0D+cXDM+5fo+nIVyL4M+iVeo//H0U6gnn3V
+vcCH0fnOlmIVYZYCCxdvn0jcfwNiqUiczzX5syYD+HSlDWI7J2S8wTRiWW0eMksm
+ZBH2AIOQJgH6mJ/TD+nw
+=Kyaz
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 4df649c08993..1c6af6ac5056 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -9,7 +9,6 @@
 	</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="pcap">Use libpcap for packet capture and read/write</flag>
 		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
diff --git a/net-wireless/ubertooth/ubertooth-2012.10.1-r1.ebuild b/net-wireless/ubertooth/ubertooth-2012.10.1-r1.ebuild
deleted file mode 100644
index 6672d4a57688..000000000000
--- a/net-wireless/ubertooth/ubertooth-2012.10.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-2012.10.1-r1.ebuild,v 1.1 2013/04/27 23:07:53 zerochaos Exp $
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib distutils
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-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="clock_debug? ( net-wireless/bluez )"
-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 )"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-	DEPEND="=net-libs/libbtbb-9999"
-	RDEPEND="${RDEPEND}
-		=net-libs/libbtbb-9999:="
-	DEPEND="ubertooth0-firmware? ( sys-devel/crossdev )
-		ubertooth1-firmware? ( sys-devel/crossdev )"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.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"
-}
-
-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")
-			PYTHON_MODNAME="dfu"
-		fi
-		if use specan; then
-			DISTUTILS_SETUP_FILES+=("${S}/host/specan_ui|setup.py")
-			PYTHON_MODNAME+=" specan"
-		fi
-	fi
-}
-
-src_prepare() {
-	use python && distutils_src_prepare
-}
-
-src_compile() {
-	cd "${S}/host/bluetooth_rxtx" || die
-	emake \
-	clock_debug="$(have_clock_debug)"
-
-	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
-
-	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
-
-	insinto /lib/firmware
-	cd "${S}"
-	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"
-	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
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}"/host/bluetooth_rxtx/40-ubertooth.rules
-
-	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
-
-	#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() {
-	use python && distutils_pkg_postrm
-}
diff --git a/net-wireless/ubertooth/ubertooth-2012.10.1.ebuild b/net-wireless/ubertooth/ubertooth-2012.10.1.ebuild
deleted file mode 100644
index 368fd82f138d..000000000000
--- a/net-wireless/ubertooth/ubertooth-2012.10.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-2012.10.1.ebuild,v 1.5 2013/03/02 23:12:29 hwoarang Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib distutils
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="clock_debug? ( net-wireless/bluez )"
-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 )"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-	DEPEND="=net-libs/libbtbb-9999"
-	RDEPEND="${RDEPEND}
-		=net-libs/libbtbb-9999"
-	DEPEND="ubertooth0-firmware? ( sys-devel/crossdev )
-		ubertooth1-firmware? ( sys-devel/crossdev )"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.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"
-}
-
-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")
-			PYTHON_MODNAME="dfu"
-		fi
-		if use specan; then
-			DISTUTILS_SETUP_FILES+=("${S}/host/specan_ui|setup.py")
-			PYTHON_MODNAME+=" specan"
-		fi
-	fi
-}
-
-src_prepare() {
-	use python && distutils_src_prepare
-}
-
-src_compile() {
-	cd "${S}/host/bluetooth_rxtx" || die
-	emake \
-	clock_debug="$(have_clock_debug)"
-
-	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
-
-	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
-
-	insinto /lib/firmware
-	cd "${S}"
-	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"
-	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
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}"/host/bluetooth_rxtx/40-ubertooth.rules
-
-	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
-
-	#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() {
-	use python && distutils_pkg_postrm
-}
diff --git a/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild b/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild
index a5120d77b26d..2fa804a742f5 100644
--- a/net-wireless/ubertooth/ubertooth-2014.04.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2014/04/08 03:35:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild,v 1.1 2014/08/25 17:42:12 zerochaos Exp $
 
 EAPI="5"
 
@@ -87,13 +87,13 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	insinto /lib/firmware
+	insinto /usr/share/${PN}
 	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
+	        use ubertooth1-firmware && doins ubertooth-one-firmware-bin/${PN}-one-${PV}-bluetooth_rxtx.dfu
 	fi
 
 	if use udev; then
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 707ecc3ac39d..6f33383936f6 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.23 2014/04/08 13:45:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.24 2014/08/25 17:42:12 zerochaos Exp $
 
 EAPI="5"
 
@@ -88,13 +88,13 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	insinto /lib/firmware
+	insinto /usr/share/${PN}
 	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
+	        use ubertooth1-firmware && doins ubertooth-one-firmware-bin/${PN}-one-${PV}-bluetooth_rxtx.dfu
 	fi
 
 	if use udev; then