From 7e1a64a2e08ec0a8b2c0b56d2f7d715598a32704 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Wed, 1 Jun 2011 04:03:55 +0000
Subject: [PATCH] kismet: cleanup old ebuilds and fix build with
 multilib_strict

---
 net-wireless/kismet/Manifest                  |   7 +-
 net-wireless/kismet/files/makefile.patch      | 119 ++++++++++++++
 net-wireless/kismet/kismet-2011.01.1.ebuild   | 151 ------------------
 net-wireless/kismet/kismet-2011.03.1.ebuild   | 151 ------------------
 ...03.2.ebuild => kismet-2011.03.2-r2.ebuild} |  17 +-
 5 files changed, 131 insertions(+), 314 deletions(-)
 create mode 100644 net-wireless/kismet/files/makefile.patch
 delete mode 100644 net-wireless/kismet/kismet-2011.01.1.ebuild
 delete mode 100644 net-wireless/kismet/kismet-2011.03.1.ebuild
 rename net-wireless/kismet/{kismet-2011.03.2.ebuild => kismet-2011.03.2-r2.ebuild} (84%)

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 7858f0c19..354714286 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,12 +1,9 @@
 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
-DIST kismet-2011-01-R1.tar.gz 916637 RMD160 5c4ab94b58c3ded97f4751fd0436c019073910d4 SHA1 412f9ef7028d4fe89a4f81e9758f74631128185f SHA256 99e76f8f7684199b9176a7a2f6b1bb5c637d89f6906d6de279794fb1fb22cde1
-DIST kismet-2011-03-R1.tar.gz 924873 RMD160 f10e767c906a65bf5b95a2662ec97e62a750c54a SHA1 ca3a9d01231a76271723b83f4e3dedd0f4b274bb SHA256 4bc1ff064dccd65dacdd2db832bc209781daa482690fba444a0b79d36744ff5b
+AUX makefile.patch 5112 RMD160 49a99899c1358c9f1ff37c03cb25166cd18ac61d SHA1 b9c195d0b72035c545fda2a19a8a487757f79710 SHA256 17f7074d0a6d3bf0f54278dd6d7a82a3fe1f2a935cd3dcef693b0177dc0ddd1a
 DIST kismet-2011-03-R2.tar.gz 924988 RMD160 58fcc5e8e438fa9d94959ea0c5b2c914ebf44081 SHA1 c01706b0441a3ea412386930bcbaf56187c66d27 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64
-EBUILD kismet-2011.01.1.ebuild 4109 RMD160 c1e67eb3dbcab8be1759ed0516969836579eaae2 SHA1 bf94b3464b45b0a87435ff0356157761bc2c20db SHA256 67cab3a18a85f01168fa77c2db148f7fbd4acc94a81f152d8625434a3c500b28
-EBUILD kismet-2011.03.1.ebuild 4109 RMD160 c1e67eb3dbcab8be1759ed0516969836579eaae2 SHA1 bf94b3464b45b0a87435ff0356157761bc2c20db SHA256 67cab3a18a85f01168fa77c2db148f7fbd4acc94a81f152d8625434a3c500b28
 EBUILD kismet-2011.03.2-r1.ebuild 4242 RMD160 4955aa22004b4c89f4b2e0363d009ec7f1f9f2f1 SHA1 75e8a4a4d8d62074413f2c0af88deaf8a4344a54 SHA256 18f073c313cf8e4baf122fcd2fb90b755a2fbaf28d37dd3e3eeedbb1d9c3272b
-EBUILD kismet-2011.03.2.ebuild 4222 RMD160 f1a30028ad2466cbf2a12b1b3cccbb3eac3d7dab SHA1 5403d7bc89260fa804e2494e311bc7c077d03654 SHA256 08b669660031602f872257dce53e09f5bf9e5cf535901fdeb53aaec36e8d3ff4
+EBUILD kismet-2011.03.2-r2.ebuild 4431 RMD160 39f607e0fea867a968ecedd21eef606cab1a5c37 SHA1 2e28028875f82ecf16b612307ab972942afc0a76 SHA256 2c8ac6df77de8c9691c57923bf0bdefdd52ad368b86b408fe57d8d4bf9dd0ee9
 EBUILD kismet-9999.ebuild 4242 RMD160 d6465a987ff2c6ada792836c1c041f95d3bbe779 SHA1 59fd730f716d0246f5b34be850c1075a55cd4853 SHA256 88381089e33094d8c533de293cedc4288cde298ccc16d3660e476b91aff3b1a7
 MISC metadata.xml 752 RMD160 fab1c88b553c13210494a57a04b2d62536a4f944 SHA1 11fb1ef46c28a2862a850b13e9af6fb405b8a008 SHA256 661ef87ec9fa7e443e0c3741199c1a9217a0932e1023288030a8cfbdbea0256a
diff --git a/net-wireless/kismet/files/makefile.patch b/net-wireless/kismet/files/makefile.patch
new file mode 100644
index 000000000..5580c5834
--- /dev/null
+++ b/net-wireless/kismet/files/makefile.patch
@@ -0,0 +1,119 @@
+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/kismet-2011.01.1.ebuild b/net-wireless/kismet/kismet-2011.01.1.ebuild
deleted file mode 100644
index 05abee811..000000000
--- a/net-wireless/kismet/kismet-2011.01.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs linux-info eutils
-EAPI=2
-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"
-	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? ( virtual/ruby )
-	plugin-btscan? ( net-wireless/bluez )
-	plugin-dot15d4? ( <dev-libs/libusb-1 )
-	plugin-spectools? ( net-wireless/spectools )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	cd "${S}"
-	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
-
-	# the configure script only honors '--disable-foo'
-#	local myconf="--disable-gpsmap"
-
-	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}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-}
-
-src_install () {
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall || die "emake install failed"
-
-	##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 || die "Header installation failed"
-	#write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/* || 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.1.ebuild b/net-wireless/kismet/kismet-2011.03.1.ebuild
deleted file mode 100644
index 05abee811..000000000
--- a/net-wireless/kismet/kismet-2011.03.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs linux-info eutils
-EAPI=2
-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"
-	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? ( virtual/ruby )
-	plugin-btscan? ( net-wireless/bluez )
-	plugin-dot15d4? ( <dev-libs/libusb-1 )
-	plugin-spectools? ( net-wireless/spectools )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	cd "${S}"
-	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
-
-	# the configure script only honors '--disable-foo'
-#	local myconf="--disable-gpsmap"
-
-	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}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-}
-
-src_install () {
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall || die "emake install failed"
-
-	##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 || die "Header installation failed"
-	#write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/* || 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.ebuild b/net-wireless/kismet/kismet-2011.03.2-r2.ebuild
similarity index 84%
rename from net-wireless/kismet/kismet-2011.03.2.ebuild
rename to net-wireless/kismet/kismet-2011.03.2-r2.ebuild
index cec9b8a12..93ed1122f 100644
--- a/net-wireless/kismet/kismet-2011.03.2.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit toolchain-funcs linux-info eutils
 
@@ -52,6 +52,8 @@ src_prepare() {
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
+
+	epatch "${FILESDIR}"/makefile.patch
 }
 
 src_configure() {
@@ -99,23 +101,23 @@ src_compile() {
 src_install() {
 	if use plugin-autowep; then
 		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	fi
 	if use plugin-btscan; then
 		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	fi
 	if use plugin-dot15d4; then
 		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	fi
 	if use plugin-ptw; then
 		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	fi
 	if use plugin-spectools; then
 		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	fi
 	if use ruby; then
 		cd "${S}"/ruby
@@ -129,9 +131,10 @@ src_install() {
 	# install headers for external plugins
 	insinto /usr/include/kismet
 	doins *.h || die "Header installation failed"
+	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/* || die
+	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore || die
 	newinitd "${FILESDIR}"/${PN}.initd kismet
 	newconfd "${FILESDIR}"/${PN}.confd kismet