stablizing on arm and removing old ebuilds

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

10 files changed, 25 insertions, 390 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index ce2cc914e72f..75bca3ee1d04 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.129 2013/02/08 05:51:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.130 2013/02/08 05:59:06 zerochaos Exp $
+
+  08 Feb 2013; Rick Farina <zerochaos@gentoo.org> -files/gcc-4.3.patch,
+  -files/kismet-2007.10.1-Makefile.in.patch, -files/kismet-2007.10.1-conf.d,
+  -files/kismet-2007.10.1-init.d, -files/kismet-2008.05.1-glibc-2.10.patch,
+  -kismet-2008.05.1.ebuild, -kismet-2011.03.2-r2.ebuild,
+  kismet-2011.03.2-r3.ebuild:
+  stablizing on arm and removing old ebuilds
 
   08 Feb 2013; Rick Farina <zerochaos@gentoo.org> kismet-2011.03.2-r3.ebuild,
   kismet-9999.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f043a928c93d..ed2487b17bb0 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -2,12 +2,7 @@
 Hash: SHA512
 
 AUX bluechanfix_r3184.patch 452 SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0 SHA512 6e9ef7a64a8b5e9fa494627b9bb818582d7b7415164a67e321460bce3d2ad88c57fc7b2a79c0384fd7346181debf5e32ca984630fc0477bf271825a16d2c5858 WHIRLPOOL 053d43042201556fec485e549dca184eb28dac77a2f4cfc69d566c5dda7da45f205e692c76cb208c97c535e4ac09edd0b6e5071c92e6d37ce9b93908af07ae7d
-AUX gcc-4.3.patch 1221 SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b SHA512 2b5415772af18e9ee29a9f02141560ce1fb54587139ded0fdbf13c58414eb9c177ed0eedddb53bdf8353724fd2fd6baa66448c82a8a4d872539afa8e24b25360 WHIRLPOOL aea1db40cb6a269bf84d5f18b1fc2766d83842cefc7de0211e604934cde511734d57bf85cc00360c3abfc79bf3ffaddd71be71947b5b1f3cd955b78882e56a65
 AUX header_alignment_r3326.patch 2031 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556 SHA512 4807e558a72ab429ffbbd3e245338b58ef9f29940b518ca76d86345ab3302679a77212699cfb1714b593eb6dc02703155c12ae9aa9dd15d402b90e6607c8f472 WHIRLPOOL e4f87d4760d9300c9c7a56a08edc9764a16642def7df000394a83b20ab00890bb1e8106985c3aa3918fa2e6bb9372f7c4d96e0fecf71337cc7b0b6e534de5129
-AUX kismet-2007.10.1-Makefile.in.patch 2716 SHA256 d74c9b7c558beff78908e3d720d2b1783c101e12c2b719315b5ac3abb2c8808a SHA512 d650a123043cd6765d2a66f8c9afc657a9e158fd15f6758de0e04d4e38f5e77c08e2a138cbbb84a302b62820eb981665c0b463b1a818c259d4b475717b352ccc WHIRLPOOL d7d3712a6b036d85e21c0b7ac7c8606519cafaff2f2acd0775995f397d7aa77dc27fe3e015c6f5f83312900ffdfa949dd32c5da00d4e10ff21609b02b1f0c749
-AUX kismet-2007.10.1-conf.d 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71 WHIRLPOOL 51e1ccf14cca8533525f038a6b6755233e3f4e65486952b09f80372756ac128d4359f3061fb97348673a5a7dfc595e3b63bfef2db5be4814f2b2cf76b2ee1de9
-AUX kismet-2007.10.1-init.d 749 SHA256 1dd3fd3fee724490908abe072577ab159c2371820561872f8af0e30ea2f83054 SHA512 7d9035e01379e04f4200b041171381f731c6d68c2d0776505322ef7dbeccba60523d9ef3cfa99021a57f86f2b076fe27d1ef5c702f2400a59df1180c34fd7699 WHIRLPOOL 820a95d33ca9a2ea98bf049e179b7c11762311cfbb99a8c8e0b90606baffb88eb6cd8032d6000a1bd5a574491f457a5cc0cfecb63f48cab50fcbf78d51c83b70
-AUX kismet-2008.05.1-glibc-2.10.patch 408 SHA256 a9a21167e0d000664c420f6eed2520119334b8d81cfc1730f70ac0396db4d716 SHA512 5ebf99eea02318f16d6b5ae2499b80c18bcb83221eddca93cacb3a0ad6df0dd7769e6af85486e33774d7b5f3be5d6a566784dfe70b2e6912a4067f3cad032877 WHIRLPOOL 6630f37bf325d18ea79bb431ed64b96addacc0692b8dea5cb9861934e9654e57dee5174fd5698d2bcc5dc46ded2628b41fb5e8fa2ab0ea8c4e8f491e05b2e9dd
 AUX kismet-2011.03.2-cflags-backport.patch 3952 SHA256 8300459a7f15b00d78c20c7bcdb757bf4adf00f28790b39dfd72cb70a0242906 SHA512 0eefcf8f515c379d77206d2b423f3f72af1b22ea57f3b94491d55e1e569f3c7cca67aae77e24afa45d998292b0d23c9d6431ccb8b4842cc50225717290dfe86c WHIRLPOOL 864b142573773d10bdbb0abbfac2073389cfb6506c80cc1836dd837cd0af91d870380d4ec76b17d184237e65fa91d7661daafed4208596984d4839b9b49e8d76
 AUX kismet-console-scrolling-backport.patch 555 SHA256 8b3ce7113e5214ffba9dd75b6027adb9f92f6e56dc3dbfde2045c77b5c44223f SHA512 6a202bf80b20553ab00a5ff7560d2cec6fbd9c23c3a47cc0a934ea2c8bd08bff7c172644474e80cd195bf4115ed9b3b4e5680de3fe29b8697be62aa33929f07a WHIRLPOOL b03d53e761933782857821633a5f09d72899bc985e795dfa6216a06a99b44fb2fc3918633062cb4c4a4563b1d0c424c62aafef7040be6794846b617365bde18e
 AUX kismet.confd 403 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71 WHIRLPOOL 51e1ccf14cca8533525f038a6b6755233e3f4e65486952b09f80372756ac128d4359f3061fb97348673a5a7dfc595e3b63bfef2db5be4814f2b2cf76b2ee1de9
@@ -15,28 +10,25 @@ AUX kismet.initd 742 SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444
 AUX makefile.patch 5112 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a SHA512 d571a22ffbb8ee1d015f96641b3770837fe4a1a0da630344c08ce9d338d1b2c4136ad7ccc74496a011742f44984019303e0faa0bb5998cfd880cc92f8ad896a6 WHIRLPOOL 6668d9bffcb17079085c7784828eeb16bcee9f79b6b3f541f38d26416f569d18d66672c4b49fa88f2faf0899efd119a8107b26656e978b2cd2d0ea3b7b04f901
 AUX plugins-ldflags.patch 385 SHA256 0cff39e40278880d4810569dc1a17c156a3e3a11579b0ce94ce394795aba1765 SHA512 43dfa75746d7b2bfa4f2de959d08d5eb040053ec98597bec71fd3f4993352936aff9b9f7c6b3a4ac7c69fdfc8308395c83d9427dcb07d22cee907cbb66e05a91 WHIRLPOOL 64a76e73470dfbf78db78ee2d242f4dfd92c4d2562dd597e3281d27abfc7f2a6e21b15d5b2893ba290e6f63c4f59887179717f5feec476e54a1d9165133dd55d
 AUX use-hostname-by-default.patch 1156 SHA256 34b7f8280549ab6022486b5e5744a6d7cebd54d727ebde4fbe5af8955d17d530 SHA512 919ea108ae089a033532ef3bf0d741c2b9e32547326b68bb8b3c1821d60493039882b3e660ea2d326205a68136d550a74e5fdff728a11ac86ea666f43af2ecb8 WHIRLPOOL be922f04a05074bfc78b40598e9ed8e42876859d92666f52b53e3f6725902621ab04050ca3b0a2bbebe5081f21e5d7e4851ff59832e1e84abd99a2c17db2d947
-DIST kismet-2008-05-R1.tar.gz 655362 SHA256 a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
 DIST kismet-2011-03-R2.tar.gz 924988 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 SHA512 4a74edd5b74ecf2171ab20a2cec5c2d0abcb6a9f24fbac6bbcab8039c67927ffa393e27932be49625a9f15c8580ea88ae51b65e42a4de5bf6bdf65631c26bb18 WHIRLPOOL 7975cfe9c754e902fc4861540ac4c21892df39f4edfc71870ee944a09769305614360a640c27753b1770bd2b1ee82f06725afbf30afb51880536d3c38261b920
-EBUILD kismet-2008.05.1.ebuild 1574 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0 SHA512 a659006832afb96fd865d67b5983f65618af42ee998b9348431c413fb4d89d9be7ac27abf917d8e911c5cdbcce352af5f8e72665caad912ab881c48d4083af87 WHIRLPOOL 3f95d702d0f70dcdfef26c67e1df220f5c1c336676c472ed71a7dad35790d231feb8b916a625f245702009d8a204a4be76f4184e5baf624a5d9f5cf61665dbea
-EBUILD kismet-2011.03.2-r2.ebuild 4297 SHA256 339a345ea483a8f619acbd429cc890fbf92be128b71929b93fa2b9f9b9a4fce3 SHA512 9565fbae60157af00f5ba99372391dc2c36947734e884717fbe8f5afded1edfa0b83f5cbe3c2491833287804eac8bf9fe7ce43ec4097b47e6047384bea3f9004 WHIRLPOOL 26d54e222f11b478f2609bc9036fae3fe9fc8036081a85f2daaa4a97d5b0d5c8ee5c45d259a80bc4f932f7318bd6587902763ef8c193542d21e3935725b953eb
-EBUILD kismet-2011.03.2-r3.ebuild 4472 SHA256 046757e840ec16e1bb6ecdd854eeeeba3be6a0978dc8638e044ae925f52b6d1e SHA512 4a4af9983e5656ab261f437e353fd0feab756f7429ba2f936fd229d6e3837f880aa5dfc6e3a10762b13d97df2ee9b5b54335e6f6d55d5c7ecd3af259065b3c08 WHIRLPOOL b84fdf41fd28036008a9009e2a2333d02eaac7a1f0384e09b5369ddcb95a551315b92af0a5e8362d950d30830342f0557f59622e9b5e0f33c52ac465ad56ec98
+EBUILD kismet-2011.03.2-r3.ebuild 4471 SHA256 ecc78f2f344cab337ce545814ecd50de934bfc9ba1475b78587307ec3d181855 SHA512 d8f9916d378c1ab96a74052a13a1012575f42786515e8d84d68744d244d632c1b52a635fc9a62df8f4fd31096a227e6b1a9c45fc3c2f9c10c82c518e65e4b289 WHIRLPOOL 1de73070979b34dc320c36c853136c7481f49f1e20862eca38cac11baadee14b12f37e36964edc3ed3fd12488d5afa50031259ea1386931d5899dbedb93477fd
 EBUILD kismet-9999.ebuild 4310 SHA256 39155daee34e41c4faa877cc1939b6bae5c8595621d86ee274fa9b8985eb3e69 SHA512 e32745f6b0224e0adf7e9e1864ac7de027bd6d458c65c6d0998b52d76372d74cd708ed81aedc45b85d5505128ea1f6ea6010eacb3fc0d94e67bfdc19f027b391 WHIRLPOOL bfdfd1874016b2a06e71fd9687b99e3e90bafcec144afe6227902cb78ab2676d6b2c7316f4359e6cd15968df90909f5d23cfbcd679c75ef823269f8dac19711a
-MISC ChangeLog 20843 SHA256 f1c44fe406cdcf5b0949c6482db0e68e8cb7df383a4b1886b2b58aa7cbeea4e5 SHA512 6debedbe7acbf7e4c4616d26f6b4da6257d892803dc2491aaaad9a015ed57237091ecd7dacf6e290f690f2d16bd551c10070443e1dd657b33148f18af81e867e WHIRLPOOL 1a09b8d12f8893898d97bd4ce4e2fa13cf8d4e496499f66d7d3ed11f7352390956224ddce92db3f0bfb4fe3a2c2895a83f39eedc4503a21b603324538766d4fb
+MISC ChangeLog 21201 SHA256 bc5137f3ee44f85b2e79e567aa11b2e5a16c8d346750beba712e5d32572bb3db SHA512 0d5e8e68f6e22961dfe92965d39c7277a772d7523f86464cc56abdc08a1da53d023b5734ec3b9ba2cff1c8a90e454c4b83f4fd2dc28c6c562bd1e70e72553ea3 WHIRLPOOL 0a934d4aa5ca65912b2658791241a462409fee10039c68f7d8a27781d7956de3bd0290b37dbf3affdfe3586ac559f0e52fc8c61586d27a996502ae1d0f2d5e43
 MISC metadata.xml 1410 SHA256 249fcbb612de7ac8ce22f0c8693bb32eb02a7c6f5b2c8a3fca909dc6451c7702 SHA512 eaf1d6f6a765cd4d574aee96c1325395d16bd104ab1c00f9b30969a72ec9688d04b3ceb0a596ab19b7fe62e9ff16c18ac6da555f25059f122359db1cf910b2a4 WHIRLPOOL a9b1b9d7053d2371791f2f36cfe28197e5e4b3881e0be46f33967a8638359675c44e253f422272515f210452c89da3f53219914ca2e9909e403c9fdd371a6a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRFJKCAAoJEKXdFCfdEflKQ28P/3T5tMdMblFoeBtIQv1lD3mr
-BnFeJ71XJ0re1e8pYyNupq0dMDu52jcoLPK8dyA/4/XVl0H1fMRVSqZ8BcaSC5JR
-3TKX+EIZRZk9JHSDHmiCcymOu6bNBGMos9Hv9i2vgrVvB0WBzL3UJhPJqJVx5WJn
-h4psPuMGTTVSg/l2++lgXGJebkN7Lqzwa/WwkXCYWp9SHewkZJhboQvHwP+TnbTY
-zWY+04e605/kNUQAkZEMti5U+HtZDGgXr8iaRAFY0vrAwDhTkNJLcdgwFcish24k
-zha815PT/NGYs5k4ikxH6fNTAA/UmxC7HThZZrSbRpgBBzxKqqaaAjRk7quvpjYr
-0K2YW1Z+x137blc9OgM6s5RkptsEXuQkkp1oXzROVKko7197Ss81FSxcf5qSJCac
-eoICOIUAZa2OJ5At+ZDPb42CW5bYzlcQOIBqLrroyNqcWRpiQTpqTZVJaNoU1M8s
-OP4twGUxWLHSOt5dRXlFdPya15nMZ4NUjFdFxdeqRXcLd9csqfzQswoHjBYo6IRS
-0K/0FunGciop6+oYyp0q1Td/20e8PF8Y4i+8Xx7D9mxXaOb23ktAWs4In/yrf6wr
-j0iYGTmRNBWkR1rms7Kejt2nhrfcGcz91ncRxcFmlRf+XN/kTmt+4inRmj9yUz1P
-Q38VBPqe+XgRN9vdIvYl
-=wil2
+iQIcBAEBCgAGBQJRFJQyAAoJEKXdFCfdEflKk2kQAJbMuYUbom1kXAqEaY8ixRc5
+suBrcrPhG4KGtyadv6w88QQNxDDTQZxN90w7ekkOnFHLkLWLuK9UHmtKtM/ezziY
+Bsb2pd9hMLeXnMSQMT9qrTp9CIevM14aYSzzu3m8eDXMUZJNCrgVReibAEYJb+Yi
+6m53c/vHf5qtnuFMygX9eZq6QhKRCdS7+bcM0OmlF0A/MV5zh+T3XXXTmZcf4u0Y
++Gje5HLusz0U6YYB+g13FFaZYa1Dwm8PBBjRJfO7oWPUfSxIWmPLr0tmnlkpUVsQ
+qJYH47Vg8WAWh3IrMYeNSCxV6b+TdhGzO0i3HS8/S+SaNizslXvam3mWF2vtH5OF
++Bz+aVTLQl1LFhKLfrVf/mUdWMa2B4nGJ97NikmL0syCjEoSgUZnoLxDBnRBO18a
+HuEeErjGKJ9PYkug17gace84PHBsU5u8Rv4Igb0Pcv2U0H9FCn+yCkmb/8QZ8ozO
+ciBGRXy8HfLy71p96Vz9HyOOHNkgxed2d5nZu/7AymggIx79STXAISYHt5VDW487
+tZcrWdfWHlTEIXJnzohUE+PYNxTuMzgiNPmpdAX8g04zYcZ85ZFLWnfWsGdkbJKA
+Ul5SR3FaEost86oNTTWaaeMNed97MdjR824CKLyqm6cMpPX0E7uDHoGDNZrnp0eN
+alB2EXNabViCLFjutVYj
+=1ckA
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/files/gcc-4.3.patch b/net-wireless/kismet/files/gcc-4.3.patch
deleted file mode 100644
index 78883a4ebaf2..000000000000
--- a/net-wireless/kismet/files/gcc-4.3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -u ../kismet-2007-10-R1/kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc
---- ../kismet-2007-10-R1/kismet_wrapper.cc	2007-10-06 23:50:03.000000000 +0200
-+++ kismet-2007-10-R1/kismet_wrapper.cc	2008-03-24 14:23:51.831523343 +0100
-@@ -28,6 +28,8 @@
- 
- #include "config.h"
- 
-+#include <cstring>
-+
- /* Blob of globals since sighandler needs them */
- vector<string> postcli_err;
- pid_t srvpid = -1, clipid = -1;
-diff -r -u ../kismet-2007-10-R1/ringbuf.cc kismet-2007-10-R1/ringbuf.cc
---- ../kismet-2007-10-R1/ringbuf.cc	2005-12-11 20:14:39.000000000 +0100
-+++ kismet-2007-10-R1/ringbuf.cc	2008-03-24 14:23:51.875510223 +0100
-@@ -18,6 +18,8 @@
- 
- #include "ringbuf.h"
- 
-+#include <cstring>
-+
- RingBuffer::RingBuffer(int in_size) {
-     ring_len = in_size;
-     ring_data = new uint8_t[in_size];
-diff -r -u ../kismet-2007-10-R1/util.cc kismet-2007-10-R1/util.cc
---- ../kismet-2007-10-R1/util.cc	2006-08-28 22:37:29.000000000 +0200
-+++ kismet-2007-10-R1/util.cc	2008-03-24 14:23:51.875510223 +0100
-@@ -23,6 +23,8 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#include <cstring>
-+
- // We need this to make uclibc happy since they don't even have rintf...
- #ifndef rintf
- #define rintf(x) (float) rint((double) (x))
diff --git a/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch b/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch
deleted file mode 100644
index bcea97e03db8..000000000000
--- a/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur kismet-2007-10-R1/Makefile.in kismet-2007-10-R1.new/Makefile.in
---- kismet-2007-10-R1/Makefile.in	2007-10-06 23:53:38.000000000 +0300
-+++ kismet-2007-10-R1.new/Makefile.in	2007-11-15 09:45:04.000000000 +0200
-@@ -5,7 +5,7 @@
- VERSION_TINY	= R1
- 
- INSTGRP ?= "@instgrp@"
--MANGRP ?= "@mangrp@"
-+MANGRP ?= "root"
- INSTUSR ?= "root"
- 
- ZAURUS = @zaurus@
-@@ -138,23 +138,23 @@
- 	fi
- 
- binuserinstall:
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
- 
- binsuidinstall:
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); 
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
- 	
- commoninstall:
- 	mkdir -p $(ETC)
- 	mkdir -p $(BIN)
- 
- 	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
--	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
-+	# install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
- 	@if test "$(ZAURUS)" = "yes"; then \
--		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
-+		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
-+		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
- 	fi
- #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
- #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
-@@ -169,8 +169,8 @@
- 	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
- 
- 	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
--		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
- 		install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
- 		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
diff --git a/net-wireless/kismet/files/kismet-2007.10.1-conf.d b/net-wireless/kismet/files/kismet-2007.10.1-conf.d
deleted file mode 100644
index d203513c7143..000000000000
--- a/net-wireless/kismet/files/kismet-2007.10.1-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet.conf
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet_server, see `kismet_server --help`
-KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet-2007.10.1-init.d b/net-wireless/kismet/files/kismet-2007.10.1-init.d
deleted file mode 100644
index 55bdbf75a562..000000000000
--- a/net-wireless/kismet/files/kismet-2007.10.1-init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2007.10.1-init.d,v 1.1 2007/11/25 07:24:37 cla Exp $
-
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
-	start-stop-daemon --start --quiet --pidfile /var/run/kismet_server.pid \
-		--background --make-pidfile --exec /usr/bin/kismet_server \
-		-- ${KISMET_SERVER_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping kismet server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
-	eend ${?}
-}
diff --git a/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch b/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch
deleted file mode 100644
index f14d5adfb3fa..000000000000
--- a/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- macaddr.h.orig	2009-03-18 00:08:27.000000000 -0700
-+++ macaddr.h	2009-03-18 00:09:30.000000000 -0700
-@@ -73,7 +73,7 @@
- 			longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
- 
-             // If it has a mask component, get that
--            char *in_mask = strchr(in, '/');
-+            const char *in_mask = strchr(in, '/');
-             if (in_mask != NULL) {
-                 longmask = 0;
- 
diff --git a/net-wireless/kismet/kismet-2008.05.1.ebuild b/net-wireless/kismet/kismet-2008.05.1.ebuild
deleted file mode 100644
index af74bf5e521e..000000000000
--- a/net-wireless/kismet/kismet-2008.05.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2008.05.1.ebuild,v 1.5 2009/08/09 15:09:23 ssuominen Exp $
-
-inherit toolchain-funcs linux-info eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus ncurses"
-
-DEPEND="${RDEPEND}"
-RDEPEND="net-wireless/wireless-tools
-	net-libs/libpcap
-	ncurses? ( sys-libs/ncurses )
-	dbus? ( sys-apps/dbus )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch "${FILESDIR}"/gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-src_compile() {
-	# the configure script only honors '--disable-foo'
-	local myconf="--disable-gpsmap"
-
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGELOG README TODO docs/*
-
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-}
diff --git a/net-wireless/kismet/kismet-2011.03.2-r2.ebuild b/net-wireless/kismet/kismet-2011.03.2-r2.ebuild
deleted file mode 100644
index 2c03f99525e2..000000000000
--- a/net-wireless/kismet/kismet-2011.03.2-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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-2011.03.2-r2.ebuild,v 1.2 2012/05/22 16:19:41 ssuominen Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +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 )
-	net-libs/libpcap
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	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-dot15d4? ( virtual/libusb:0 )
-	plugin-spectools? ( net-wireless/spectools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch "${FILESDIR}"/makefile.patch
-	epatch "${FILESDIR}"/plugins-ldflags.patch
-	epatch "${FILESDIR}"/bluechanfix_r3184.patch
-	epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch
-	epatch "${FILESDIR}"/header_alignment_r3326.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
-	##is there an automatic way to force this?
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h || die "Header installation failed"
-	doins Makefile.inc
-	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore || die
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf || die
-
-	if use suid; then
-	dobin kismet_capture || die
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture || die
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture || die
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
index f497b19ed310..e6bd845309df 100644
--- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.7 2013/02/08 05:51:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.8 2013/02/08 05:59:06 zerochaos Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc x86"
+	KEYWORDS="amd64 arm ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"