stablizing on arm and removing old ebuilds

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

9 files changed, 10 insertions, 367 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/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"