simplfy bluez deps and turn dot15d4 off due to build failure

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

3 files changed, 29 insertions, 11 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 3c5440520565..e7b7c8c32f83 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.123 2012/07/03 16:37:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.124 2012/07/03 20:37:56 zerochaos Exp $
+
+  03 Jul 2012; Rick Farina <zerochaos@gentoo.org> kismet-9999.ebuild:
+  simplfy bluez deps and turn dot15d4 off due to build failure
 
   03 Jul 2012; Brent Baude <ranger@gentoo.org> kismet-2011.03.2-r3.ebuild:
   Marking kismet-2011.03.2-r3 ppc for bug 420615
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index eb0116456281..c5085af1e891 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bluechanfix_r3184.patch 452 RMD160 cc207c174d02c25f60f0e383f39435f35fa843e3 SHA1 a3c95e2cad5b105e2b875bec0631b85ec7e1018b SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0
 AUX gcc-4.3.patch 1221 RMD160 6c9c7da7c90367a363dd5d6a4e23eeee89791552 SHA1 2aff87ae336cb27d8e96831a7ab57d3f328ca78e SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b
 AUX header_alignment_r3326.patch 2031 RMD160 e6573980e79e9bfcaf91795b26709188d0daf021 SHA1 d17bd21180027f87aea6d8a7fdba4fe43eef7c06 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556
@@ -16,6 +19,23 @@ DIST kismet-2011-03-R2.tar.gz 924988 RMD160 58fcc5e8e438fa9d94959ea0c5b2c914ebf4
 EBUILD kismet-2008.05.1.ebuild 1574 RMD160 544efe108a3cde2c2da659b465d53e55149e23fb SHA1 78a0209330c2649cda6da1ace1f900dc7c1afe76 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0
 EBUILD kismet-2011.03.2-r2.ebuild 4297 RMD160 47e0215d5978f1dbb505870c2a4d9f19663294a7 SHA1 ede0f3ff2d1fefac8c95bff64bc80b77d95e098d SHA256 339a345ea483a8f619acbd429cc890fbf92be128b71929b93fa2b9f9b9a4fce3
 EBUILD kismet-2011.03.2-r3.ebuild 4341 RMD160 11662a320e91857ae661a05bf529d1acbd6c56a2 SHA1 18a15401007b73cb87cbc4798e941b0839625894 SHA256 5660a0bee0b43a0b5e5789625b5510ee595482184e717430cb49281f9f1b1049
-EBUILD kismet-9999.ebuild 4398 RMD160 185ba0b34de4095221ad28194e68a05fa231eb2c SHA1 f9817ec8871e5308e3d6910a5f351d8d6675de3a SHA256 9523f65fd8391182f7022b64c594796237e7ad44139bf11aed574bf634c5a8ef
-MISC ChangeLog 19953 RMD160 5ca62ac051748cf78b9a64336def0a3d8ddeb10d SHA1 6f3f1bdcd8957dedad9019c0cf7492bb2a10dcd3 SHA256 49ebaeaf420b15fd22adc528b8bdb4cbb311755980e897d7505e7c6fbd7a15e1
+EBUILD kismet-9999.ebuild 4229 RMD160 c396d14c3e6b1e7b5d9499af818d94b9b0f3cf2e SHA1 0eb4b2fb653309f72671936a00c363664e8d6654 SHA256 dbec3d2bb8c5402e4f4e03fa4bb4b807210cad496c09dcfdc5d3790a5e0b4e70
+MISC ChangeLog 20090 RMD160 2b1ffb27f87050cc21aa130b0dca955928a8c70e SHA1 8db847820ae5de05d8f7d49e8b1f4a017c027bf6 SHA256 f439698134bd02a9045044ea78a94c73ebb44badfc92212e141cc389b77b85e4
 MISC metadata.xml 1431 RMD160 6a5b244e598e024a0a15271688d646d16a6a3299 SHA1 ec4301d22912255396f01fa32e01bac3b547a739 SHA256 cfec763d85e8e12bc4600ffc5c28d023aae892cef14662fd42e235d2908e6721
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP81g8AAoJEKXdFCfdEflK4B8QAIaPkp9uFVZh8Ho7Tsz3IxC/
+vCI9/qcHDBu4S56m53eMEcrWNm5KeX2K3bKB3u8/0JdcIytnkEUgFthaNqlj4Val
+grABMRtH6eHuQInLb4pIQm5lKCL98OoJclef7+mFm1sWRPnO0hXd7HBMpc4lycSk
+48dgLluLXJUCrmggbwcHZyggyfOg2ia448RITbTpbYVb83Kaak+Bd+7eMvXt85l9
+8kzmeIEeEMDlTZCxoBKwXWPdHqF8Dl8xz3V8WYozYHo4jRWSeUVKxRe9WO7Kklwj
+ms74VkSDNcSpoCAq5FSgZpEsHOlccC7Ff/KfzCKsLnRk3i16GgfTZEudecgelXO5
+hpEEqBWjGZBCk4KWnly8EAuO35U7UKIPvOZiqqEAIpwBKKKwjFWcDze8Vitrh2YA
+23y+SNHgvuqcQ+RFiKkA7BL3gWIW+Zj6DQWjf5PhuHB1nD8uhW+IE47iIHkqcxvG
+ZAgKh5xHbC+VGwr/8QlumzuaZC6hwB+/ovYAlwF8m2XYEyc/hlg8RQgRNuE4RKpL
+yReMR03Zyh23cn2elX+SIjr9b4yN/fXjlRdXaQkFKF6s14LNZ5TnLYJFxN8hpkab
+L6HKVUsjfA7Tb5aVLNt1SfTjvRp6hSEiWdyym7O2RM/5ty4d//z1uk5nriHb8WnP
+x1rWw5BlaAxfJWb/D8sD
+=3dmM
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index fefc897dfa51..a2bd2843723b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-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/kismet/kismet-9999.ebuild,v 1.2 2012/06/13 00:51:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.3 2012/07/03 20:37:56 zerochaos Exp $
 
 EAPI=4
 
@@ -24,10 +24,8 @@ HOMEPAGE="http://www.kismetwireless.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid"
+IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid"
 
-# Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch
-# or 4.96 which still builds properly.
 RDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 		>=dev-libs/libnl-1.1 )
@@ -37,10 +35,7 @@ RDEPEND="net-wireless/wireless-tools
 	client? ( sys-libs/ncurses )
 	!arm? ( speech? ( app-accessibility/flite ) )
 	ruby? ( dev-lang/ruby )
-	plugin-btscan? ( || (
-			>=net-wireless/bluez-4.98-r2
-			=net-wireless/bluez-4.96
-			) )
+	plugin-btscan? ( net-wireless/bluez )
 	plugin-dot15d4? ( virtual/libusb:0 )
 	plugin-spectools? ( net-wireless/spectools )"