version bump and minor live updates

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

4 files changed, 90 insertions, 32 deletions

diff --git a/net-wireless/kismet-ubertooth/ChangeLog b/net-wireless/kismet-ubertooth/ChangeLog
index 3fa96dca99d6..15d489947326 100644
--- a/net-wireless/kismet-ubertooth/ChangeLog
+++ b/net-wireless/kismet-ubertooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/kismet-ubertooth
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.14 2013/04/27 23:12:42 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.15 2014/04/08 03:14:08 zerochaos Exp $
+
+*kismet-ubertooth-2014.04.1 (08 Apr 2014)
+
+  08 Apr 2014; Rick Farina <zerochaos@gentoo.org>
+  +kismet-ubertooth-2014.04.1.ebuild, kismet-ubertooth-9999.ebuild:
+  version bump and minor live updates
 
 *kismet-ubertooth-2012.10.1-r2 (27 Apr 2013)
 
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 6ed331f1c284..72ac4e6c9c09 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -3,29 +3,31 @@ Hash: SHA512
 
 AUX kismet-ubertooth-0.0_p534-respect-cflags.patch 2069 SHA256 5e5e780b053e482c98f9ff03ea94dca6e644ad678860b2c38a9aed76baa0fee2 SHA512 8d5055289206eef3682b442edd27475b8f22c875476634fbabb55527340193bda7d3543cd41b46073fc1e7015834d3ff31481e0a191373aea67fdd8a3d79795e WHIRLPOOL 55501da57964eb79aa6d108472f3545e2d177a4e964365e6922c3fbc2eaae5203a32565beaf65ba447d2876280c712ad0434b0cc69480c6e3e21314b3ab4aff4
 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 kismet-ubertooth-0.0_p534-r1.ebuild 1530 SHA256 1167443818de49e754671434a260eb90a767439a6470e49974bd06b841e746f4 SHA512 954dae7ba072ca7ef6fe7be2ca5a363a0dd22f4afab8ac7f3ce4489fd4387015dd06fb3bcb49f05bb1c250b7a4e7c719b4947e8d4afe498d88dadbb085acdb99 WHIRLPOOL 5b28eadc5997e5c89f9200eb7ab3786b2172eb184f4a8e9089fc3fc2f8416fb914d8dd2297b9108db16383e80b6f7d542ea1622d35ff20d98950c6ae6f836a72
 EBUILD kismet-ubertooth-0.0_p534.ebuild 1556 SHA256 6f6a08566c7c95f142133ada525983454b843fa23020f11f1c43b3892572c39d SHA512 50cdf13cc9f5ef6fb13fde5f5c44694cf3dc05f6a921538cbd91d79cf8efcd17bcc6d41fc4c81dc2a6f3b821c2b490383d4ecab5748f2a6303fa6afe2a6b4944 WHIRLPOOL 1f91bd22f7fbea1f5aa18efaa68b175174828d15ed846ca3e7dbc301bc2483d29d11316e59364b1a106aa052b646235fdbde7d0d0af9b1f248e179f9fdcc445a
 EBUILD kismet-ubertooth-2012.10.1-r1.ebuild 1499 SHA256 9751f28d4996e220a6180013ce3e80b78a10e8ae0bbaa7ff1c85010795b4c158 SHA512 c7053997190344652f68558e2170ccb13c7a878de4a9a854ff373738bac0877975d07b815d9704bf995e50b929a82b191efdce64be633cf796a3d1579f95ba39 WHIRLPOOL 92eaaf71710f6bb6c2fb5f89a8bff62515297f44a1888afeee686b149260338d597b46d2dea405b832e45337b6b0d5c6c687ea046e53ca72fed46b876d41e596
 EBUILD kismet-ubertooth-2012.10.1-r2.ebuild 1503 SHA256 32f792ac0cb8c32652a8e7f580da112781c08ee21e90c7d37a341942cadc8754 SHA512 cfb8a672480bb70785fce80326b8692320edba7bd15990f7e33619aaa6b78aed9108c7e6620111bd2fce3555e4f4cb38e9d173bb3f531ceee90c7fa023b69c41 WHIRLPOOL 2bda31420b16691b4f937e9605c8d670b580039dfb23dc9e53828b01f17fd77e70d65afb59284df2c5900e21ed26c9c59e617028c248c2a2ea90d3c00936e58f
 EBUILD kismet-ubertooth-2012.10.1.ebuild 1488 SHA256 e3ae277b568dc4f226530cd7b56ba45c8d858d92fe49e62551bdd9e8c4381b16 SHA512 693f49a86a0a83b353401dbb83dff6cd7f60cb7d14dc6f104657b4e889f719f36172bf7936b6dd647aae2cb69073a5d84655a3a2403f7fbc5b3054b4f6dab6e7 WHIRLPOOL fdff442b27123b4b6af449014dc33aad0ae870df9380a27cf2078c69e6f0e29f65649128768cb01f19e170623b750b1f739cb7784c2b1e73d9cec9a7ea87c862
-EBUILD kismet-ubertooth-9999.ebuild 1575 SHA256 38d911531e4a1e6c2ab116a431b5dbd03d5b68abb8635b204a45aaaca7e51477 SHA512 b2f234469def2ebe3600fd94bec37fd9342f7bb34c8005ff1f25b0773dccf0e727c0e2f6ea12654f24446f069005fcaec7f832427447469b2560359cf691892d WHIRLPOOL 85c1c6ac2f25d6377e638c694b81b458555ce6eb68303e1baff2d4731ca603b51529c2463400e5de2755caf73ce456989871de9a96118a8b6598d227b9dcb09c
-MISC ChangeLog 2887 SHA256 c0a3f5696223e463d6f1fe1ec7d4523a999da97bdb4fee7dc3b6174d6404b07b SHA512 41648cf51bb2fd73cfef2b7f31f9c8cb9d26fec3f6ec6191a172d6a53bc76e89c8dc0cdbf2ad071c8ec4bc636dea0ac8afb5e00f1f7a27082fe255b75218ae2b WHIRLPOOL 2b170ed79911062cda92fcd931b059e888bda68e007f1689b8600a685d6f28ecabb3bd1ad2e148e0cfaa531e7cf30b9cbf41008d030783d964643775536f1d61
+EBUILD kismet-ubertooth-2014.04.1.ebuild 1525 SHA256 4341c1baff00613b08b5e1dd364fde2b00a8409d5e27478cf644e5c9a6c8ef77 SHA512 4bbae096bff06fa10b41abb235a4c6b077644023cb411b16b4cf7973d0588eaf9bf5e8d80cc5f7b332efd5f18d568c1575543f91ba199acbc098dc3fc46aad0c WHIRLPOOL 5230c3cc7c9b475c5812929ea7a7aa532a8ca1a52f6a768e456189222ff8f11b48dee5c02c6a5f1955c8fe6743ce3b53c026e117ead54744899c7bc9843e637e
+EBUILD kismet-ubertooth-9999.ebuild 1513 SHA256 b850fa3bb27a667092a16471aa3d707be778408076e8c13c9140c81400734366 SHA512 62bb204c6ff3463d49bb7727512392193f179e7f526de420ecac9f982a8e80e5a88871e378e9488a55b2de5550df4882764fda6bbbd145bfaa9780bca1e6ccec WHIRLPOOL 4ea0fd56ca783a24f3ad1042218b70f9042dd68996efc9db775f18f789ddc2cbe817a3f311de5a9b24656bac87c598ca271a6456f6593bad8bd52a6478bf8f4c
+MISC ChangeLog 3087 SHA256 d8482bd1d1f7fa5904546db9096db298b0b6c70a4ca021dbc301afea7f3dbb6d SHA512 fbd5793c340d96c2f35d5cd7da52fe65fb2aa9f674725c64e00f959ab2cda01967c428ee4684bc3b2d2883219c457e7f85f2970a0bed7bb28aa35c10d643d441 WHIRLPOOL 9d9c8a1192ac7db41c8812cc35d46e829813ead9de79c8dbed65d55e67a6b3448fd5d5c6866e834fae2525be88c1edc7236ca4310841ce377b89897dd30842be
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRfFwWAAoJEKXdFCfdEflKq6MP/1GBUfuxigs6gzWq8tto2rky
-iMpVBx2X1dPR4BJ3pcjLirIqtRITDwrQJLSLeJBZq6eRn1xW1JW8BvkGela7LApA
-Q9yf/OkBPWtS/8LWdg+TX84e1E9pa+Xe10Xt/UjAlr6/+GaiZtOuX7mi1+kNNM82
-4Qim9W7e5uAtqIv4fMCIhl+p8wgsEseCt9oRmSMcCfAOwa3fRmQivcMr1WFZQQOZ
-WHlz3DtGJjXpAd0WBoQhu0XEWW+WZdltAt/DPfv3eaFOkV2vRHPtD+6SeOrvsHQY
-P+MF39gj57E8kUvqksNrVsaXyBg8KzamXdrmvQneR7tqcE2ygyWCgBhVUpLO+L3O
-bjMVC7KEqaO7YSG4ukl411Tnd6E2YO9EM//qLJmr/3WjFfaJwI8t5siISKXWmJ6b
-dzZ+aM8VX/+7zK1i1h1gOFAdgfx7HFHOQHYfi88uiywUFk8jTR7PF4mRXcp4+nqt
-jxv3cv0fGX1flTQizUV5NpEZSS8jb/OTOAbk0yFJAPQBpUjcFtuSs0cFPKJtb5Lz
-iFkRCC5eyS646ekf+9BwjD0LwURDE/SoKXIjWzcWV6LmgUcnbnG5qwDJ00CP3zJ4
-HSvbj2hbdlipjxShvNgFOoivIQM/vSj1X8C5Juut6ZVK7SU6WT3hOe6s2SlRID5d
-vRltQJp5QS0kUzz2EHnH
-=2knx
+iQIcBAEBCgAGBQJTQ2nlAAoJEKXdFCfdEflKa7IP/jkO2xr9kt7q47nPwZqiFj6G
+y9mlqIrXljxIv320XajU3q1kH6G7B0X4u6YTVj/XPPc1evGx60koMt59pH9bNyg9
+dzHVd+YCrPuV3Vuv6BtYSc4NEsCI1Ccp98Z0quZOAtAg/eecnVtb3qPzHmspicLl
+E4mSyBUpAkmcCQhIiQr0cyuxmoc6qkw22u7QZ22VN6VnLfnBQDIPwW8WYYfLhx3s
+KtWbW/gfJVXirkB7RIvqg7WS1/ZsSPuScKME8njTj+TSdgu3a7R+CM3/VOcG025z
+d0VxvJY/qSfr00Nd/H7sv0G1M0pnS086P5axbqRyuV70KmUkRz/4yP8PcCORtLQw
+q+NFk88+fA+Slh299mfpdNfFd9oWDtVegBPcwzA4ddEV2RkPhf2/rW3KPNN+3q2r
+gjmM91GHqgQfm0PhTZUpAgdWz+BuAwd3BBA82/x95yGL09U0eV5b9J3llWs0TPVf
+fwuzh+U5h0wOAWgo05fwklq0ZUQVoKc0q1besbSLg2jpKbMvaICbAfuNqO2jmpS6
+j63wo94sLNSh8BdEU4RoXBtDz+JsXPKqfceQT5QhaGAmm2tsKX/C/bgwU+i0Edfl
+vd8QPoefH8JpVVSEfnnci9arUjqE4FGWwm4a6AmsVGncbWo4755f58Jl/IMbG0ik
+ec7pFK1YK8/A21QjDdsM
+=9iV0
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild
new file mode 100644
index 000000000000..1dba8623f1aa
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild,v 1.1 2014/04/08 03:14:08 zerochaos Exp $
+
+EAPI="5"
+
+inherit multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S="${WORKDIR}/ubertooth-${MY_PV}"
+	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Provides basic bluetooth support in kismet"
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
+	>=net-wireless/ubertooth-2012.02.2 \
+	>=net-libs/libbtbb-2012.02.2 \
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/host/kismet/plugin-ubertooth" || die
+	fi
+	emake KIS_SRC_DIR="/usr/include/kismet/"
+}
+
+src_install() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/host/kismet/plugin-ubertooth" || die
+	fi
+	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
+}
+
+pkg_postinst() {
+	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
+}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
index 9648bf8aa7bb..ccb8b60eb66a 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
@@ -1,24 +1,20 @@
-# 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/kismet-ubertooth/kismet-ubertooth-9999.ebuild,v 1.10 2013/04/25 23:48:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild,v 1.11 2014/04/08 03:14:08 zerochaos Exp $
 
 EAPI="5"
 
 inherit multilib
 
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-S="${WORKDIR}/ubertooth-${MY_PV}"
-
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/ubertooth/code"
-	EGIT_PROJECT="ubertooth"
-	#EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	#SRC_URI=""
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.xz"
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S="${WORKDIR}/ubertooth-${MY_PV}"
+	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -30,8 +26,8 @@ SLOT="0/${PV}"
 IUSE=""
 
 DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	=net-wireless/ubertooth-${PV} \
-	=net-libs/libbtbb-${PV} \
+	>=net-wireless/ubertooth-${PV} \
+	>=net-libs/libbtbb-${PV} \
 	virtual/libusb:1"
 RDEPEND="${DEPEND}"