diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
deleted file mode 100644
index 6df7761d8..000000000
--- a/net-wireless/kismet/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX bluechanfix_r3184.patch 452 RMD160 cc207c174d02c25f60f0e383f39435f35fa843e3 SHA1 a3c95e2cad5b105e2b875bec0631b85ec7e1018b SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0
-AUX header_alignment_r3326.patch 2031 RMD160 e6573980e79e9bfcaf91795b26709188d0daf021 SHA1 d17bd21180027f87aea6d8a7fdba4fe43eef7c06 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556
-AUX kismet-console-scrolling-backport.patch 555 RMD160 f7ed68284e54b1ca60e6d0b4e7972d474e704197 SHA1 6425814984c0d8724857dc71d4b800d3e8b2b42b SHA256 8b3ce7113e5214ffba9dd75b6027adb9f92f6e56dc3dbfde2045c77b5c44223f
-AUX kismet-pentoo.patch 490 RMD160 374c3be715e6b5741f3232d50ed1194783f9ca11 SHA1 3ae5ae1c6e392a710ee85dfec801c098c4a4129d SHA256 a38b0124e6d07bac442cf7fc62feba2fbd540f2d0cb93daba82238bf124bf63c
-AUX kismet.confd 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb
-AUX kismet.initd 742 RMD160 f91c46a9a3d1cac2610659e65a1a3538af4f2772 SHA1 54aa3d489e2fade47cca11a036cb1237dab7786a SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624
-AUX makefile.patch 5112 RMD160 49a99899c1358c9f1ff37c03cb25166cd18ac61d SHA1 b9c195d0b72035c545fda2a19a8a487757f79710 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a
-AUX plugins-ldflags.patch 385 RMD160 c6b1ff5adff82b6b5c42703ff322c95ef3c24ff7 SHA1 34cc545832db7ad8ed90a9d2a52e048487dc5548 SHA256 0cff39e40278880d4810569dc1a17c156a3e3a11579b0ce94ce394795aba1765
-DIST kismet-2011-03-R2.tar.gz 924988 RMD160 58fcc5e8e438fa9d94959ea0c5b2c914ebf44081 SHA1 c01706b0441a3ea412386930bcbaf56187c66d27 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64
-EBUILD kismet-2011.03.2-r7.ebuild 4139 RMD160 67e7e7d88782ad895f74d1de5bca95a79a6a506a SHA1 00442dde6e1cb1f505a8fa541b92d6e93c6fbeeb SHA256 aacc6066b47aa1131228b3b46d02ac8cd2bccd1e0549aaecbabf2a67623be79a
-EBUILD kismet-9999.ebuild 3931 RMD160 55406b41cc912f0f70a0188bec24be684aa3c548 SHA1 7d3a70541cecb16e62687f5c03179607cbc48807 SHA256 0bb180ef7ef2d302d95e2c9834a24269f4b22e9908ca0fb7f707cf927a4bbdc2
-MISC metadata.xml 752 RMD160 fab1c88b553c13210494a57a04b2d62536a4f944 SHA1 11fb1ef46c28a2862a850b13e9af6fb405b8a008 SHA256 661ef87ec9fa7e443e0c3741199c1a9217a0932e1023288030a8cfbdbea0256a
diff --git a/net-wireless/kismet/files/bluechanfix_r3184.patch b/net-wireless/kismet/files/bluechanfix_r3184.patch
deleted file mode 100644
index bdc05cb0b..000000000
--- a/net-wireless/kismet/files/bluechanfix_r3184.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: packetsourcetracker.cc
-===================================================================
---- packetsourcetracker.cc	(revision 3183)
-+++ packetsourcetracker.cc	(working copy)
-@@ -151,7 +151,10 @@
- 				break;
- 
- 			case SOURCE_channel:
--				osstr << psrc->channel;
-+				if (psrc->strong_source != NULL)
-+					osstr << psrc->strong_source->FetchChannel();
-+				else
-+					osstr << psrc->channel;
- 				cache->Cache(fnum, osstr.str());
- 				break;
diff --git a/net-wireless/kismet/files/header_alignment_r3326.patch b/net-wireless/kismet/files/header_alignment_r3326.patch
deleted file mode 100644
index 408456eca..000000000
--- a/net-wireless/kismet/files/header_alignment_r3326.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur kismet-2011-03-R2-orig/packetsource_pcap.cc kismet-2011-03-R2/packetsource_pcap.cc
---- kismet-2011-03-R2-orig/packetsource_pcap.cc	2011-01-05 16:52:51.000000000 -0500
-+++ kismet-2011-03-R2/packetsource_pcap.cc	2012-02-20 22:37:17.973526919 -0500
-@@ -553,6 +553,9 @@
- }
- #endif
- 
-+#define ALIGN_OFFSET(offset, width) \
-+	    ( (((offset) + ((width) - 1)) & (~((width) - 1))) - offset )
-+
- /*
-  * Useful combinations of channel characteristics.
-  */
-@@ -617,6 +620,8 @@
- 	enum ieee80211_radiotap_type bit;
- 	int bit0;
- 	const u_char *iter;
-+	const u_char *iter_start;
-+	unsigned int iter_align;
- 	int fcs_cut = 0; // Is the FCS bit set?
- 	char errstr[STATUS_MAX];
- 
-@@ -658,7 +663,7 @@
- 
- 	eight11chunk->dlt = KDLT_IEEE802_11;
- 	
--    iter = (u_char*)(last_presentp + 1);
-+    iter_start = iter = (u_char*)(last_presentp + 1);
- 
-     for (bit0 = 0, presentp = &hdr->it_present; presentp <= last_presentp;
-          presentp++, bit0 += 32) {
-@@ -686,6 +691,9 @@
-                     u.i8 = *iter++;
-                     break;
-                 case IEEE80211_RADIOTAP_CHANNEL:
-+					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 2);
-+					iter += iter_align;
-+
-                     u.u16 = EXTRACT_LE_16BITS(iter);
-                     iter += sizeof(u.u16);
-                     u2.u16 = EXTRACT_LE_16BITS(iter);
-@@ -695,10 +703,16 @@
-                 case IEEE80211_RADIOTAP_LOCK_QUALITY:
-                 case IEEE80211_RADIOTAP_TX_ATTENUATION:
-                 case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-+					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 2);
-+					iter += iter_align;
-+
-                     u.u16 = EXTRACT_LE_16BITS(iter);
-                     iter += sizeof(u.u16);
-                     break;
-                 case IEEE80211_RADIOTAP_TSFT:
-+					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 8);
-+					iter += iter_align;
-+
-                     u.u64 = EXTRACT_LE_64BITS(iter);
-                     iter += sizeof(u.u64);
-                     break;
diff --git a/net-wireless/kismet/files/kismet-console-scrolling-backport.patch b/net-wireless/kismet/files/kismet-console-scrolling-backport.patch
deleted file mode 100644
index 01baea0bb..000000000
--- a/net-wireless/kismet/files/kismet-console-scrolling-backport.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kismet-2011-03-R2-orig/kis_panel_windows.cc kismet-2011-03-R2/kis_panel_windows.cc
---- kismet-2011-03-R2-orig/kis_panel_windows.cc	2011-03-02 17:04:05.000000000 -0500
-+++ kismet-2011-03-R2/kis_panel_windows.cc	2012-02-07 11:53:39.634360668 -0500
-@@ -1936,7 +1936,7 @@
- 
- 	// Import the existing console
- 	constext->SetFollowTail(1);
--	constext->SetMaxText(50);
-+	constext->SetMaxText(250);
- 	if (kpinterface->FetchServerFramework() == NULL)  {
- 		constext->SetText("Kismet server not started (or not started via this client)");
- 		textcb = -1;
diff --git a/net-wireless/kismet/files/kismet-pentoo.patch b/net-wireless/kismet/files/kismet-pentoo.patch
deleted file mode 100644
index ce5247d90..000000000
--- a/net-wireless/kismet/files/kismet-pentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kismet-2009-11-R1/conf/kismet.conf.in kismet-2009-11-R1-pentoo/conf/kismet.conf.in
---- kismet-2009-11-R1/conf/kismet.conf.in	2009-06-15 13:23:07.000000000 -0400
-+++ kismet-2009-11-R1-pentoo/conf/kismet.conf.in	2009-12-04 21:15:44.000000000 -0500
-@@ -7,7 +7,7 @@
- version=2009-newcore
- 
- # Name of server (Purely for organizational purposes)
--servername=Kismet_2009
-+servername=Pentoo
- 
- # Prefix of where we log (as used in the logtemplate later)
- # logprefix=/some/path/to/logs
diff --git a/net-wireless/kismet/files/kismet.confd b/net-wireless/kismet/files/kismet.confd
deleted file mode 100644
index d203513c7..000000000
--- a/net-wireless/kismet/files/kismet.confd
+++ /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.initd b/net-wireless/kismet/files/kismet.initd
deleted file mode 100644
index e18dd0106..000000000
--- a/net-wireless/kismet/files/kismet.initd
+++ /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.initd,v 1.1 2008/08/11 16:57:47 armin76 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/makefile.patch b/net-wireless/kismet/files/makefile.patch
deleted file mode 100644
index 5580c5834..000000000
--- a/net-wireless/kismet/files/makefile.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -Naur kismet-2011-03-R2-orig/plugin-autowep/Makefile kismet-2011-03-R2/plugin-autowep/Makefile
---- kismet-2011-03-R2-orig/plugin-autowep/Makefile	2009-11-05 21:50:32.000000000 -0500
-+++ kismet-2011-03-R2/plugin-autowep/Makefile	2011-05-31 21:15:06.000000000 -0400
-@@ -1,6 +1,7 @@
- # You will need kismet newcore sources
- KIS_SRC_DIR ?= /usr/src/kismet
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -21,8 +22,8 @@
- 	$(LD) $(PLUGINLDFLAGS) $(PLUGOBJS) -o $(PLUGOUT) $(LIBS)
- 
- install:	$(PLUGOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/lib/kismet/$^
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$^
- 
- userinstall:	$(PLUGOUT)
- 	mkdir -p ${HOME}/.kismet/plugins/
-diff -Naur kismet-2011-03-R2-orig/plugin-btscan/Makefile kismet-2011-03-R2/plugin-btscan/Makefile
---- kismet-2011-03-R2-orig/plugin-btscan/Makefile	2010-04-28 15:31:26.000000000 -0400
-+++ kismet-2011-03-R2/plugin-btscan/Makefile	2011-05-31 21:23:55.000000000 -0400
-@@ -1,6 +1,7 @@
- # You will need kismet newcore sources
- KIS_SRC_DIR ?= /usr/src/kismet
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -27,10 +28,10 @@
- 	$(LD) $(PLUGINLDFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
- 
- install:	$(SRVOUT) $(CLIOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/lib/kismet/$(SRVOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet_client/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/lib/kismet_client/$(CLIOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$(SRVOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/$(CLIOUT)
- 
- userinstall:	$(SRVOUT) $(CLIOUT)
- 	mkdir -p ${HOME}/.kismet/plugins/
-diff -Naur kismet-2011-03-R2-orig/plugin-dot15d4/Makefile kismet-2011-03-R2/plugin-dot15d4/Makefile
---- kismet-2011-03-R2-orig/plugin-dot15d4/Makefile	2010-07-29 20:59:16.000000000 -0400
-+++ kismet-2011-03-R2/plugin-dot15d4/Makefile	2011-05-31 21:17:25.000000000 -0400
-@@ -1,6 +1,7 @@
- # You will need kismet newcore sources
- KIS_SRC_DIR ?= /usr/src/kismet
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -26,8 +27,8 @@
- 	$(LD) $(PLUGINLDFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
- 
- install:	$(SRVOUT) $(CLIOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/lib/kismet/$(SRVOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$(SRVOUT)
- 
- userinstall:	$(SRVOUT) $(CLIOUT)
- 	mkdir -p ${HOME}/.kismet/plugins/
-diff -Naur kismet-2011-03-R2-orig/plugin-ptw/Makefile kismet-2011-03-R2/plugin-ptw/Makefile
---- kismet-2011-03-R2-orig/plugin-ptw/Makefile	2010-04-28 15:31:26.000000000 -0400
-+++ kismet-2011-03-R2/plugin-ptw/Makefile	2011-05-31 21:18:14.000000000 -0400
-@@ -1,6 +1,7 @@
- # You will need kismet newcore sources
- KIS_SRC_DIR ?= /usr/src/kismet
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -21,9 +22,8 @@
- 	$(LD) $(PLUGINLDFLAGS) $(PLUGOBJS) -o $(PLUGOUT) $(LIBS)
- 
- install:	$(PLUGOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/lib/kismet/$^
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $^ $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$^
- 
- userinstall:	$(PLUGOUT)
- 	mkdir -p ${HOME}/.kismet/plugins/
-diff -Naur kismet-2011-03-R2-orig/plugin-spectools/Makefile kismet-2011-03-R2/plugin-spectools/Makefile
---- kismet-2011-03-R2-orig/plugin-spectools/Makefile	2010-01-07 18:33:30.000000000 -0500
-+++ kismet-2011-03-R2/plugin-spectools/Makefile	2011-05-31 21:19:09.000000000 -0400
-@@ -1,6 +1,7 @@
- # You will need kismet newcore sources
- KIS_SRC_DIR ?= /usr/src/kismet
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -27,10 +28,10 @@
- 	$(LD) $(PLUGINLDFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
- 
- install:	$(SRVOUT) $(CLIOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/lib/kismet/$(SRVOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet_client/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/lib/kismet_client/$(CLIOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$(SRVOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/$(CLIOUT)
- 
- userinstall:	$(SRVOUT) $(CLIOUT)
- 	mkdir -p ${HOME}/.kismet/plugins/
diff --git a/net-wireless/kismet/files/plugins-ldflags.patch b/net-wireless/kismet/files/plugins-ldflags.patch
deleted file mode 100644
index 001ab78da..000000000
--- a/net-wireless/kismet/files/plugins-ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur kismet-2011-03-R2-orig/Makefile.inc.in kismet-2011-03-R2/Makefile.inc.in
---- kismet-2011-03-R2-orig/Makefile.inc.in	2009-11-05 21:43:30.000000000 -0500
-+++ kismet-2011-03-R2/Makefile.inc.in	2011-06-01 00:13:13.000000000 -0400
-@@ -38,5 +38,5 @@
- MAN 		= ${DESTDIR}@mandir@
- WAV 		= ${SHARE}/wav/
- 
--PLUGINLDFLAGS = @PLUGINLDFLAGS@
-+PLUGINLDFLAGS = @LDFLAGS@ @PLUGINLDFLAGS@
-
diff --git a/net-wireless/kismet/kismet-2011.03.2-r7.ebuild b/net-wireless/kismet/kismet-2011.03.2-r7.ebuild
deleted file mode 100644
index 7003e25c2..000000000
--- a/net-wireless/kismet/kismet-2011.03.2-r7.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit toolchain-funcs linux-info 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="~amd64 ~arm ~ppc ~x86"
-else
-	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-#Few dependencies are still not stable. Comment out keywords during repoman testing
-	KEYWORDS="amd64 arm ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ncurses +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
-
-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 )
-	ncurses? ( sys-libs/ncurses )
-	speech? ( app-accessibility/flite )
-	ruby? ( dev-lang/ruby )
-	plugin-btscan? ( net-wireless/bluez \
-			!=net-wireless/bluez-4.98-r1 )
-	plugin-dot15d4? ( <dev-libs/libusb-1 )
-	plugin-spectools? ( net-wireless/spectools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kismet-pentoo.patch
-
-	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() {
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	if ! use pcre; then
-		myconf="${myconf} --disable-pcre"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}"
-}
-
-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="${ED}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#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
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf
-
-	if use suid; then
-	dobin kismet_capture
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture
-		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-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
deleted file mode 100644
index ffce385e6..000000000
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="~amd64 ~arm ~ppc ~x86"
-else
-	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-#Few dependencies are still not stable. Comment out keywords during repoman testing
-	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-syslog +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
-
-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 )
-	speech? ( app-accessibility/flite )
-	ruby? ( dev-lang/ruby )
-	plugin-btscan? ( net-wireless/bluez \
-			!=net-wireless/bluez-4.98-r1 )
-	plugin-dot15d4? ( <dev-libs/libusb-1 )
-	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
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake
-	fi
-	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-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	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="${ED}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#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
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf
-
-	if use suid; then
-	dobin kismet_capture
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture
-		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/metadata.xml b/net-wireless/kismet/metadata.xml
deleted file mode 100644
index 5f5cc591b..000000000
--- a/net-wireless/kismet/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>no-herd@pentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="plugin-autowep">
-      Enables a WEP easy key scan plugin
-    </flag>
-    <flag name="plugin-btscan">
-      Enables a bluetooth scan plugin
-    </flag>
-    <flag name="plugin-dot15d4">
-      Enables a 802.15.4 scan plugin
-    </flag>
-    <flag name="plugin-ptw">
-      Enabless Aircrack-NG PTW plugin
-    </flag>
-    <flag name="plugin-spectools">
-      Enables Spectools spectrum analyzer plugin
-    </flag>
-    <flag name="speech">
-      Enables Flite text to speech engine
-    </flag>
-  </use>
-</pkgmetadata>