remove old ebuild and fix libpcap[netlink] for libpcap-1.4.0

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

5 files changed, 31 insertions, 182 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 32b1f1e98c18..8f6fec60ce7e 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # 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.135 2013/04/25 23:38:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.136 2013/05/10 16:12:34 zerochaos Exp $
+
+  10 May 2013; Rick Farina <zerochaos@gentoo.org> -kismet-2013.03.1.ebuild,
+  kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild:
+  remove old ebuild and fix libpcap[netlink] for libpcap-1.4.0
 
 *kismet-2013.03.1-r1 (25 Apr 2013)
 
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 28e6424b346d..eb9fa4a723ab 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -13,25 +13,24 @@ AUX use-hostname-by-default.patch 1156 SHA256 34b7f8280549ab6022486b5e5744a6d7ce
 DIST kismet-2011-03-R2.tar.gz 924988 SHA256 71a099fb724951cdd55c28e492432ca21657534c91a536c206f3e0a8686d2a64 SHA512 4a74edd5b74ecf2171ab20a2cec5c2d0abcb6a9f24fbac6bbcab8039c67927ffa393e27932be49625a9f15c8580ea88ae51b65e42a4de5bf6bdf65631c26bb18 WHIRLPOOL 7975cfe9c754e902fc4861540ac4c21892df39f4edfc71870ee944a09769305614360a640c27753b1770bd2b1ee82f06725afbf30afb51880536d3c38261b920
 DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
 EBUILD kismet-2011.03.2-r3.ebuild 4401 SHA256 6bd8d758c4ba262f5a3ccc0bce0cd7d01ca30f0ccc34fb1a39ba90e1e57918f8 SHA512 a709147cd2cc35b026fba48917c1c595324da96db421d5ea4d4e9c693f80526cc615d4f6f8af68253048714d29e9c53c3cd6eb2ef3ccd79ea68ee141f6b953e7 WHIRLPOOL c8b7789cef32337c531f1a64633ab0184b057eb1ad288f423c5991f0ccfc4baaff4a8634eddf9edc92c8315595f895ccd157efece3b56779e13e83598ee2e811
-EBUILD kismet-2013.03.1-r1.ebuild 4290 SHA256 7cd21136c1a9e981f0a906447f5fd4496b2f5d02970465954c8d6ee82bb6443a SHA512 f7e1e3fb4469c49ad1d498c794779ebe7d91780389c0ab198458f7d08a3e64197fa2309f90834ddb4ff0fbe7d58d6c2c6ad4ae258627aa4c62fec920512a8306 WHIRLPOOL e77f499ee05735913bd2fdfb173d96f4794fcaf520fe93cb71316898ef3b5916fd328474638bf4e57242af6c0cec94454661e672b8e8334bdb98b38f0b64bc4f
-EBUILD kismet-2013.03.1.ebuild 4281 SHA256 df842619f1418701dafd88ce83b29211e388a23b4119bccf3e31357d12873c30 SHA512 330cd685a5ba98b92f48df63d380e05fbc16410d1b11455346f9d33de795d207819f6b89035f1d6b41e1da768a20ef973de80628c90f24f175443af669001325 WHIRLPOOL 995de545d4a070e34e51526f279d648239d2e5897141000b4288ed4a2012d4068d3d125dee185f0e9f84f61878ba71d53b405a748007cc50d16141c37f5a02e3
-EBUILD kismet-9999.ebuild 4290 SHA256 0d6306554eadaece0f706045b4aac0f0762cc5be8ff7a53a5f09314aed0303d6 SHA512 8d21f6c79857bb439fbbecaed66c0781ce1d00cbc2326d2bf621d37b5facf26d5c3d64ce2fe9f20bd1e2fce85a5776aed2dff13bc3203f385bcaaf0215a1d4ca WHIRLPOOL 7b60fcac1d3fbff1e566ef861eb789b6dcd7e0f41595439640fbcf18c033ce345b834df7031cac5b18a1737b7b03fa6db5bd2500f4f23d018f127202e7f5a74b
-MISC ChangeLog 22087 SHA256 bc8c4b1f65e4eaf971fe6545a576f691aa0d380d005dc9c6a372a9bb93709932 SHA512 fc9ac76be7b72c484ce45e4ab9e7e995720cf59b969b0dc3da0b3405c99d7b7e8abe822afc2f4dacefb5ce835df461094cae845d697aa090ffa173ba92161386 WHIRLPOOL eac246b8e676da1b79da31c0ca910f3f8a6ae626e823694b07c8fea5c9679a831865bda576a637775684b19cb28c5f03bfcdae1898886badcb7f47f436377993
+EBUILD kismet-2013.03.1-r1.ebuild 4340 SHA256 f2c70de48cb4b4b19cb428ce7f77db19eee3641af644c1a4339d04cf48fa7579 SHA512 8790fe20608d735d2e5c164d77b7e8d47663e311bf80bc6119dc60e6e7964c038ffdac30fbf942146481aa7169f01683826a61e806b7b5bd8195328d9a7f2431 WHIRLPOOL c7c4185e25c1f5cf41e54e073358d71eb3ed0fd83e1f30aafa934351813cddbf6d7d731c868c0580603d710ac0869841b86199b53605c0eea2af5d95064200cc
+EBUILD kismet-9999.ebuild 4341 SHA256 4fc782de0d92a4acaf2f9b049e898f980566c98e89077d519c66ec8002496a51 SHA512 e9c2f980ccc12a674ff352a0052cd4b3ac5d9f1d5ec3f439231b680458a6396d1a88154a49f9c2263a80730c3c7baa473375e42275414a5aec82ff27eab796df WHIRLPOOL 0661b21de32d2f4d5f365c42ea7b6727c946f217f30c64fef96c2a9301194a80971f4462d0c5935f094a1088c994dbf6f2d72d4670556de793b079025e6e3d2d
+MISC ChangeLog 22277 SHA256 79d7b2be4de12478f393fc41a6d23a025da14ae659d73f33af6420456ab3acca SHA512 7d54579eb6ac0089edbaeea166e6a2be2a4a5526ec0cc0ff866931da2200301216d736553be1e8180deba8ba4fdf0439f8109e6fd5fc523d3e8a46f2d0d56c28 WHIRLPOOL 04932946e7aaa169ff37c73ba1c7d6fecb3ff779f4bcaa73b3f728fc1d11e0c504c33dabceef81b304e7ec05df3db721650965100b6aa8b185dae6b4836d8f94
 MISC metadata.xml 1341 SHA256 36e071c984d507b1d231b37414b9e9c74183234974ff922d94969b2d33d620d6 SHA512 63654708684f7b1c408269a5cd596d3ca4786ee50fbc76e0d68a3819fb02f50f49a8b9ec42703fac54a318a87f058c304e5ad4a363beb1c41ed407810c5f23ae WHIRLPOOL 45e8cd0ff325361705e6d53059f5f14b171919fa77d24a4572104a9c401036273ba53e5f4dc49c180790495342b72c5da80a975e302de28f4dbf3e67a26b07c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJReb8OAAoJEKXdFCfdEflKtREQAIqdiAk9d27d5zerqJUPsRd0
-KVi1HiQfhvyj2wp84LnXYfyYp/hGYeWR4wE5ccddrLzzYiQfDNAd/tawSJGN3N1p
-jbLi2/56TlMTqutdEXzfMf0YEAhKHbK5iZDtlZeYb/gJCCPr1HnOXWokVTQj9+pr
-JvM47LY/2aZPdvtfB6QlsmGgtpII2XXqlQ6PGsoXx0emHf8cn+TUnfjaFS6GWnqt
-egYicaYaG2YKIqW6VaGNOKsiiKuCs2Hf2UTUqudqZElxU6Q0x9LURG+RO2wC+hAk
-Hat5NClRQAyj+csdy8+WIEIEFIQ8rjI+RN2Anhb6dNOQfFqWNPCFJ32erTW/paEG
-2mA1cf8UH38x9L8tQznK532nk7vpCFtdFqsBrcp4wyau/cT2peY+xCd2TRBOzyT1
-2acAKTeS9B7uau0P9aWp+vB6ZW5i4/D1O8Ivq4LVFEC4aLkPFgSdpSQwGHpV3Vzw
-jBff+mnIrsWdRkLe9nrId0BBaZq0x6G9uSJN3H4tcfYoGeduufMkfW1/m7KZI7e4
-ipPJJZaPEt+hyYfpRfScMlq1rSPmCym26Z1W1Csr87BWMUmek2FqKBHzZvdKbkx5
-iRxwxX7/YpeINIcB/ThopL5DcEgpxZCqTjGkYBigslIBEWEvbnpe+4RCO6SlbMIM
-ZYHOcVsrXF/xYvWoKa9E
-=lwDA
+iQIcBAEBCgAGBQJRjRx4AAoJEKXdFCfdEflKSoAQAKHUp0tDpdicgRJxEEY7U8un
+n7o6bLPdFUd6YDdBuqmglwWjB5XCnjbVM7rpiZsKZTGviFbOGZPJuQIxDbLJM5xi
+AAfkMoCG9deWmxiyxv2EYAuE1aPGIHLTD+UYOTjchvht7zB19QhMxNeq/qLOZYz5
+IJDfkeRrKRse90AR9wlSa3jnPtwxfnMZJ7gyd2sOpjPeZdQwLNcytuUox+lOgxSe
+9k/bGSK9L5CADQkxfIbFHmlr+/DtwDHiizi0Qpu3GQu0v1S5fqAX+PkNoi6BbFXX
+/Q6BDfiBtEIh8mZL6SM7Xn0pFtCV0TW+GAgx+00V32cYEqg0szfY669rgucV2OJE
+L7HvwK++fUVP5Xq5gwX8ZDgGVVj2accvV5uqa9Fa/roOlbYtlyUyM+g6nPgOHEzi
+ZUpyR5bPNfX5jLwt7wZAUH7pZg3FCCnjBYz3mpCqS/jKMEcfAI3ggrsPXwL8dX8l
+Bc6m43yFZI4HOa710U70IcjLnP8RzUznZhoBwyk1hXsVJFmxm1kn4lU7fTsW2z7Z
+bN2vVa33rt+XOlmOgba4OtJOu2pnpP+vzb6zkhRwNWf/3GW/TgPpQplgriguZf12
+HyfxFiygs41/rTOvhT84YuDVhubFaRTy5+OHcA5d0ivJHKgtJCvaG0p3KrQUc/Wd
+H8sM+uZqL30Uwsff6n+6
+=KxC7
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild b/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
index 5305fca525f0..4befdcea3214 100644
--- a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2013.03.1-r1.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-2013.03.1-r1.ebuild,v 1.1 2013/04/25 23:38:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.2 2013/05/10 16:12:34 zerochaos Exp $
 
 EAPI=5
 
@@ -30,7 +30,10 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin
 RDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
-			net-libs/libpcap[-netlink] )
+			|| (
+				<net-libs/libpcap-1.4.0[-netlink]
+				>=net-libs/libpcap-1.4.0
+			) )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	client? ( sys-libs/ncurses )
diff --git a/net-wireless/kismet/kismet-2013.03.1.ebuild b/net-wireless/kismet/kismet-2013.03.1.ebuild
deleted file mode 100644
index d29c3adb5445..000000000000
--- a/net-wireless/kismet/kismet-2013.03.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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-2013.03.1.ebuild,v 1.2 2013/03/27 21:52:57 zerochaos Exp $
-
-EAPI=5
-
-inherit eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-	SRC_URI=""
-	inherit git-2
-	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 +plugin-syslog +ruby +suid"
-
-RDEPEND="net-wireless/wireless-tools
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap[-netlink] )
-	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 )
-	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
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/restricted-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}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/restricted-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}"/restricted-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 plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		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
-	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
-	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
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9a46b5aa7b16..92d2d417897c 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.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-9999.ebuild,v 1.9 2013/04/25 23:38:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.10 2013/05/10 16:12:34 zerochaos Exp $
 
 EAPI=5
 
@@ -30,7 +30,10 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin
 RDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
-			net-libs/libpcap[-netlink] )
+			|| (
+				<net-libs/libpcap-1.4.0[-netlink]
+				>=net-libs/libpcap-1.4.0
+			) )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	client? ( sys-libs/ncurses )