version bump, minor cleanup

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

4 files changed, 176 insertions, 25 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 77f73caac0e2..6b5d0a46a2ae 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/aircrack-ng
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.91 2015/02/05 03:46:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.92 2015/05/04 04:14:21 zerochaos Exp $
+
+*aircrack-ng-1.2_rc2 (04 May 2015)
+
+  04 May 2015; Rick Farina <zerochaos@gentoo.org> +aircrack-ng-1.2_rc2.ebuild,
+  aircrack-ng-9999.ebuild:
+  version bump, minor cleanup
 
 *aircrack-ng-1.2_rc1-r1 (05 Feb 2015)
 
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 96e4c8a2a6bc..7655f1a635eb 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -2,24 +2,26 @@
 Hash: SHA256
 
 DIST aircrack-ng-1.2-rc1.tar.gz 2046476 SHA256 cf3134521e1c3d7aed4e384e3e5e7b6959e2d485bd1554474608a3a9328e35fd SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d WHIRLPOOL 2f8df161c61b8dfa6f4bd5f4af677273f255f01ae84853a80fcde4c07f03e51dcad9dcf007afa5a1120521c641d35c23d07b1edfc51c90d7b8b216b179d27ea9
+DIST aircrack-ng-1.2-rc2.tar.gz 2046531 SHA256 ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9 SHA512 49794c80a76da20698d0372a81fdbd54f2defb694c23807369be7632e57d21cb09f14d3013b199f247663286c316714ee0fae8a6d302cabbe48ffa1e6ebefc56 WHIRLPOOL d0a221a840ab7541648b204bc8e38108fe125999167a8477cf5a1cfc309a892fd72c888bad28ab83fc049b46a5817b72e9da6d5e0c6ed9cea97ba4ea741765f3
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3653 SHA256 25caf541063a3dabbe6d358c4d337d9fdbd3d8579e2fcd73599b65122c7389ba SHA512 7af69fd00211d42499e15910fd8125719b90fc66a33e3fabd254bc06fb02efd96b4ab8e29979bb4f8147fe23ba04f63a5f86a59153447a310ed5dc0ef76cbd20 WHIRLPOOL f0c59e490b8989ec320e317c09889055e5f99e61136a33bfa858040114f3c2c28d93396b3648c618d61ba49519d334752a5e70d0a765b2a20a82fb2ada55a949
-EBUILD aircrack-ng-9999.ebuild 3659 SHA256 845b9892d91254849fbd09b4fa7d1a63c604bb9a6c6fef49f47003c8f815debd SHA512 966ca0e4cccff5648ab831c0fa19ec8b18d79b307c331c8ef83ec21310e334ad4e16777426dc7d98bde338da6ce7302369fe13165e9744846c363206dec76199 WHIRLPOOL 155e05e9752974295b14fd7c59e327e99996f19b3ceb86438b59625f4cee366dcffea9c05be680549b37527e5946b6e39d984b649a997c3ef9a34e9985b2372e
-MISC ChangeLog 14928 SHA256 c57a28d65dba406d9518f8596470a086e94757612951896158a58c350d30ea5d SHA512 c18afcd1109f74b7cef51d10044babd8f6be968602494d051b166758e8c3d9434f3a7ef1890b74411f98edcb3ee4d5ae20fa9b75ee28a7d846ce7658d279a9b1 WHIRLPOOL 17bbbe4c1ea5b94f6e016c5f3e58b24f94dd048657ed5c97d8c2178b25fef201622a561be33e7f0176b463d4d550e2c7880a5b3a97bae854e2738631e4c446fc
+EBUILD aircrack-ng-1.2_rc2.ebuild 3628 SHA256 27a7a75dbb91686a1b2c08637d1caefd23e610f99a45e53d64b72bb69c61db79 SHA512 8a06317f0d8de807515bd02be52499538fb3a505dda8e8815365edacbe504229e5c59fb0b2469724bbb2cd6327567cf527edc8bf5892656c7ccfdbcb31937d3a WHIRLPOOL 67a612097569f6bf4a2a2a3f33c0a40301bfc2218a4926508eefe66c7fc7ebb8f252ba640fbd99a77daeada3e20239f0e6034c929cdfc24f310f081d0d052083
+EBUILD aircrack-ng-9999.ebuild 3866 SHA256 cd8c4dee9482299c2ab0f478af5a8233d80e2a545c70ce6c408a8543cde624cf SHA512 6857e8b28c53ec341b5b5119628d08c07c5f2e09eac5c10f30893cb875b4643821ed017407534b8a58dbd5a686befd13122621a2d1da9056450fa9f2cb03261a WHIRLPOOL f72adc6ee04896ed4e5306d92890ca79a0c7056b22a2820c1e9b952cac36338377a8245d04513f7acf71e561758e4a46ae77dfa43bbe401574014efc7fdda38d
+MISC ChangeLog 15101 SHA256 66dc9fccf4b7975e7f054decd3b5c76ddf7e85ab15d91e5cf7e1a2a956baa91a SHA512 7ccc19d977d95bdc39f936b4c99c4a3923fc38e229b3a991cd92c2e8e0e40f1a6fa179e91a54be2146768c960cdc8967773366b65a9881ae4e7def253edf8be7 WHIRLPOOL 59290cb063dfa9d144ae264c614d409714f5c89a91ce8b1397383f71e6bcbef70e7479041a9c7b20cc70d40391660ee7c4d579fccf6156b72124f371f77d06fc
 MISC metadata.xml 817 SHA256 9cb2b1c61779baaa8c53ad94a131334dcc380c365e3ce2a91cf4a2391edafa5b SHA512 e481c5eefbee13b7ea53900db1fba01cac98bb2213d01365f264cdeade3ce84b0c14021a0817b3269c03fad9e45b9164726ce14812cf704133191779c6b7ea8e WHIRLPOOL 95479f33ae3e88505a77f8ac8246a35dd29b60e2ee57262c043c880d1a8f34c3aa4c45db6aace401799ef749d55ba5528eb0d3b9ef2b6d8315e0805f7b9fe223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU0ueOAAoJEKXdFCfdEflK7DYQAJMcDUdG6EyqJFayxT3nJw+L
-HE2sX0I5JUEaGHkixQU0/uKi52OT+l3NM+2zNvk97ZleozQGzL1wslWB3RknlFXJ
-BDxU71dDiOi7FuwHwWBBV7epfvzmYwGdnOD1hHCOhCKvyyoaHF2P2nHZVz8u4Tgr
-TlFg+/iRQNtADkHt/mrQ0KJCdNzxBUILobQXXUwrpFBLzXbLyfUS4CvU/wEWl4Rl
-AVVXvbjl8o1a0mhc7NBVEgO2xKsLsCwL2PnsI8wCUDf465LyBhS3cuJEuBTcblKi
-/PRLFY+wcjqgINKPAsdXn1aNxikMByyXlaLQpB2b+GgpwUvfxim0gDCiQsjLCWaw
-SsSqClVfJ5F1lg7x0fj492Fx90ev9C9q237HTNqZufF3s+ss4flcRroFQNMDOzw+
-gmdxeI2VGkGJGZjY9oH/pVWN8NSr4d0fCPVju8ymvDqYWzl5OLQIyfWoaF4JHMcc
-zoUU+8YT+x14YH0QsyOhLEPJYTl6MGVkcZzEab6FkwIIrz/3WsNIPfrDhC4xa2de
-9GvfcIUfG1S/Vt0OYD+Ss5OxPCyqsfF0taGzSBu/BFapPd+vIZG6995ZK8p+6JPl
-WtLqSFZCJ7L2rbFDG96EjdWWyP7CU43bKQrSeeA5OWuSHEVR2Bww9l1kkLlOSLG6
-GX6ClUEV0IwXCcgZKIQc
-=UIkq
+iQIcBAEBCAAGBQJVRvItAAoJEKXdFCfdEflKVeMP/2O/gcXNzHRt4sL5y/fxVHS1
+ZXeJSxQrzbKc/AUFLTPv8D1lYiGjKZvy6Bn8tVul1XIx8ADt+8uvUacOKZH8+cvp
+JzSw9fyZ/Uy1WEKxPIW2FkPzkmkT1Ow9FKg9vWBQhQb9SteQiyxVbFN38sbhp5ED
+JXvdNP7uGctjnUAf1/ZdQKuCc2ZzlSNhC82UuKflmj41rezEnXO0cLuvJ5YLkInr
+dgpXIze+WQXz2+PdQkovj+CuGKftzjMo78IMsADFZCLYZeONx92iO8crNPrRBPS9
+ClsDB/Oq4z27DDPQmCmAqfZJ1n3EjNcBiRf+CJCvcKODcqpkqRy7uba2Eujg7vmW
+kUp3T3u+U8a68TELd8cYVBCN5b28Sdi+y7ibLjaTYUt02fX6+Tm0MFjbKlOnljKW
+BqP58NuNN7LoKDRWkDnR4L5QvoKidXRhFxpvw8taCb7K9Q1iPVtg139vTnsPpCax
+kqTn/k6uybOYdHEroVrv3UvrBtBVT2bsZu4C2KL4NuvlXXFy8oTw9fpdhn3DPbsH
+2HcY1Kr5j0c9qT2E5cPF1+Mxcsgd1cwQoeLQZwz2GvYHn2DorButGZzorQkzvOS3
+gnXbYmQH969jji1/VHq89RuYiObfn95GmaUCR/P001zfo1L1rXiFbKzhwu/zboy5
+WGmZtxGYP07yFclU/fPw
+=/awW
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild
new file mode 100644
index 000000000000..fc8c39ad7a94
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild,v 1.1 2015/05/04 04:14:21 zerochaos Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
+
+DEPEND="net-libs/libpcap
+	dev-libs/openssl:0=
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwids
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		die "Please use gcc, upstream bug http://trac.aircrack-ng.org/ticket/1144"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+	fi
+
+	emake \
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	LD="$(tc-getLD)" \
+	RANLIB="$(tc-getRANLIB)" \
+	libnl=$(usex netlink true false) \
+	pcre=$(usex pcre true false) \
+	sqlite=$(usex sqlite true false) \
+	unstable=$(usex unstable true false) \
+	${liveflags}
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	if [[ ${PV} == "9999" ]] ; then
+		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+	fi
+
+	emake check \
+		libnl=$(usex netlink true false) \
+		pcre=$(usex pcre true false) \
+		sqlite=$(usex sqlite true false) \
+		unstable=$(usex unstable true false) \
+		${liveflags}
+}
+
+src_install() {
+	if [[ ${PV} == "9999" ]] ; then
+		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+	fi
+
+	emake \
+		prefix="${ED}/usr" \
+		libnl=$(usex netlink true false) \
+		pcre=$(usex pcre true false) \
+		sqlite=$(usex sqlite true false) \
+		unstable=$(usex unstable true false) \
+		${liveflags} \
+		install
+
+	dodoc AUTHORS ChangeLog INSTALLING README
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	#we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 84c194b57a72..6adf9b496911 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.11 2014/08/03 23:13:27 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.12 2015/05/04 04:14:21 zerochaos Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit toolchain-funcs versionator distutils-r1 flag-o-matic
+inherit toolchain-funcs distutils-r1 flag-o-matic
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -18,11 +18,16 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
 else
-	MY_P=${P/\_/-}
-	MY_PV="$(replace_version_separator 2 '-')"
-	SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
+	#inherit versionator
+	#MY_P=${P/\_/-}
+	#MY_PV="$(replace_version_separator 2 '-')"
+	#SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
+	#KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	#S="${WORKDIR}/${MY_P}"
+	MY_PV=${PV/_/-}
+	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="GPL-2"
@@ -30,7 +35,8 @@ SLOT="0"
 
 IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
 
-DEPEND="dev-libs/openssl
+DEPEND="net-libs/libpcap
+	dev-libs/openssl:0=
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )