adding distutils-r1, thanks to significant help from mgorny

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

4 files changed, 178 insertions, 21 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 4febe5a4ded9..1429594bfdcf 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.81 2014/04/17 19:14:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.82 2014/04/18 01:30:53 zerochaos Exp $
+
+*aircrack-ng-1.2_beta3-r1 (18 Apr 2014)
+
+  18 Apr 2014; Rick Farina <zerochaos@gentoo.org>
+  +aircrack-ng-1.2_beta3-r1.ebuild, aircrack-ng-9999.ebuild:
+  adding distutils-r1, thanks to significant help from mgorny
 
 *aircrack-ng-1.2_beta3 (17 Apr 2014)
 
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 2030eff7d328..c365ae452d64 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -19,24 +19,25 @@ DIST aircrack-ng-1.1.tar.gz 1453272 SHA256 b136b549b7d2a2751c21793100075ea43b28d
 DIST aircrack-ng-1.2-beta3.tar.gz 2053021 SHA256 2d22ae13360d466ffff1699cb1300ce5f807ffe9762314bb60ee49d9d2efe98d SHA512 f6d17be10b8277f08d8867b4ced5a89f9de13cc59767958a6c617e583724d0baaafdda6c14ef3c1671cada2a5abdf885b49728910fb64d70a41ace9043b3e372 WHIRLPOOL 6c2ed9d45ff4122a15af1f95c2ee91c5df25bffe940814ff20a46d51b442d8295a55c1b7524454cfa82f27f2f3a1b3cde069139cf48fadffb87c514cba34ced0
 EBUILD aircrack-ng-1.1-r2.ebuild 2256 SHA256 80dba3e8a0c29a26247bb24121bdb72ab9caa95bd7754bd23f441d7132a3042c SHA512 aecec438af459d967e129b48946217600f39e9932fb74db6e7506d7a2c82ba3ae276167d2f91a339bbe60ec8c0747446b4fd415d291c1c0040af39856a5454be WHIRLPOOL 3f82e245e7066976604d4c6d141a79ff1aa321b86540bed263cfef8fdf14c75531efe1cc6b9bb66e56a0c5435c85d8c41bf6acf2a5001a1fb2d2004314b32575
 EBUILD aircrack-ng-1.1-r4.ebuild 2732 SHA256 03dad5c6d19b80a60ea9a366f03702999c4be5a6ccb309074e669b4fd3af3c78 SHA512 c653ed18aff24fc337d159d499823779391b0db717875f2ebb2a38d5d9daff946228c0b96a1e14bfc7c168179a7d44848c0a3c38fc8a9d5857612628b2eb69c4 WHIRLPOOL cd577b154b08e78884edd8947660fb38cef191fb280997bb3e2de13d6b32a722665e8cd55ea477dd325605cb0f6044f54cd72cb4a22dcb5004a4205b262d5fc1
+EBUILD aircrack-ng-1.2_beta3-r1.ebuild 3519 SHA256 2e5f5c38cbdabd4dbad658334b97e9fdfa66ea86719a23fe489340c85fcc10b1 SHA512 b5ac6d2c0d915840e9f1bdc6e36ef407a74eb346b1dd7f8d73e07ef892856679e611461eabb775351bdc7e664cb67035baf10f93839a2fcf3d5bc3bea2c0ee3f WHIRLPOOL 56a10115e3200e7acbb6ba5193f342101cc3a274077898cd7aa9ea18e1f1a167b3e8ee8ffe230db5ca82da79ad5ae38da437960244ce915bca686de1f4a61cb7
 EBUILD aircrack-ng-1.2_beta3.ebuild 3113 SHA256 ae0a2abe484dfaf504732fd8d40e4e55e8932b7190856dd7035c1afab138f5cd SHA512 391bc3031835e37970788df31d30485d2a35355bc8ae3a48e436b5673235dd1a6357c49086e46aaabdab57eacd9b08c61474ff9a60b3c0f150ad84c9723a594e WHIRLPOOL f05dfcfa44d26d9a90d6df568a533e3e8e3f8602f9e9aad77f1c2e1845ea205a7bf04b1466a0fd94b98ceb42ed7004e14cd5faf4bcdfca72fa5e1b52a7f26b5d
-EBUILD aircrack-ng-9999.ebuild 3108 SHA256 7fd19078ecef740ce65d5bf2a7bde84fd9da9b335eed09fa268014cb6573c0ac SHA512 27c92dfea2a9692bbc36947621e4616d04ee40c846f18161f2df353bf458ede25e52500edd41e3bcd433cea91338ae3ab39c680d4ee8013d49e09879a0409523 WHIRLPOOL f579a1619e9df4694c7993559217bc989f8f23c9d439dc7baa9496885902d1ab8803d2abef1405555fbcea2c852e55befde09fbd7a0ad70cf75c9bbe72c900b7
-MISC ChangeLog 12682 SHA256 33d01e52120a36b1f4decd5ad316c6ded9d51b9f83599bb3f1c0161dcc3dc9bb SHA512 ef8457a4d6a1f06d1d2e06c983a770d14d127aa642a0cf6c04e1ccd921c9bcc4e92e4b2bb254b3b992da64a94b8f241b84ce4d0406c6eddf7e05f44c825aa08c WHIRLPOOL 421b4bf1aac518edb2970e544527537148370665553c9e89457b48f264bde78623546b3a8f9ecd6828727ca1ad62af0773c2fd1bb62a9d650c7754019b2f3e18
+EBUILD aircrack-ng-9999.ebuild 3511 SHA256 d646c8faa2b80e7054834e2a2c961ae1a2c3fb4ec22f2c5d483ad83a0d0758c9 SHA512 b8f953a23ec8032b4139703c1177a807725b75a6487b5622620fd5eb89f25767f3d442b94baccc482c948366db63b25a9760230041f8d5e57e7bf3bad561ac1d WHIRLPOOL 0d2f3c48c0255d45b6160cf421e26796cb3a01841ccd2e1090ccbef1c6cb1be116a250dcb00d61545c639fdf70cdfd1611ead6c150023f7cf078ad07b9987159
+MISC ChangeLog 12897 SHA256 15e8786bcd3b040af8483c4900097b2d68d953bdd126058135bee3e69ee27ed5 SHA512 1743c5dddeb2def34e2e28eae24d599ebbf2bd407bae767642b1fa5d6a5ab96c160eaa7b2570765979adff4341a250fd28a06f1c9781cd757bb41340a5b60843 WHIRLPOOL c34ca2844d431bbd9306eb8dc92217109a2ef7bffac5db6b06a9cc5a4dbcc1e947f2ec2f0d6384d451483348b930d773b209946117f8544ec316b9f60e76753d
 MISC metadata.xml 817 SHA256 9cb2b1c61779baaa8c53ad94a131334dcc380c365e3ce2a91cf4a2391edafa5b SHA512 e481c5eefbee13b7ea53900db1fba01cac98bb2213d01365f264cdeade3ce84b0c14021a0817b3269c03fad9e45b9164726ce14812cf704133191779c6b7ea8e WHIRLPOOL 95479f33ae3e88505a77f8ac8246a35dd29b60e2ee57262c043c880d1a8f34c3aa4c45db6aace401799ef749d55ba5528eb0d3b9ef2b6d8315e0805f7b9fe223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTUCiTAAoJEKXdFCfdEflKzX4QAJi2gMLHXGCR7LB29ZPAisYu
-PtHqvjRlmim3El8rEHWXc1DsrlIRuU4biEViF7ZRy10IxKvzga0MUHrxVkK/LsSF
-Jnm3lh1ugOQXrB/xPIr1D5jVSfE2zV9p99/v/RMzaapbFa/aIjXTF0UG2g4Vt5IJ
-nrYRrv/V0LFZZ6vL56wRruvspMAUGk+w7fz9veKDTfDffck2SWqrHomQF0GSXhaY
-MhfeUbSONj85A6BmhQzONktwEllNHpy6rWNfvKYw/VV8dXenhmtnAG7uxjXtY0nM
-oAF0U2Re2X88AyMLdcUJNjDh3zoYvU6JoGT/0Aa6R3QGX2V9WhmJBO3+bHOjPXrL
-oYiuxtIzx2Mgpfv7O6bGja+gtL0eP9E6RmlSqi16j+dMAXa1Fr4f/ChspD4p4ivk
-7yWsrObmy78OAhtps193Hv5P3+szPnmRdbmfpUfQDj16bHtXPW4BX/YCqVaF2k5y
-EALJ30nGof64IZjQ65GZKyqmtuLxuhVYoKpQJdrugmEBhejDo1bX0AlObLwFXkW/
-acUo9Am53rM3avMHVuONLfMrQ7HSFN+ypQ/PL2LjQhKzJQRaxUc7QjTw1dzEHMWl
-B4Rik54ngZhZsnSufspCn1g4iyrvu4Dv/E1ul70IW+89SxDf0BnUDNG1tdRGQ5Tm
-Ruq8IRzHnbbhaLnP/oOC
-=zNpm
+iQIcBAEBCgAGBQJTUIDIAAoJEKXdFCfdEflKUgwP/2zF5rXgdqStkpAmfQ63+rku
+EBXqQjy54EYiiirDU5Ln7dl/aYEbHkjsMJA2IfWHTUviByUFdEx9XmLMPZc2xSuB
+taAzuuD9Q5u9oyGGmApNIBeD64lei4w1WjRlBSLWSzHLVY8ibgr0y4EhdFL+R3cg
+56sGBAY8oc1kQ+2j5DD+3Dccno2hq8ghszCB9+zekwARAmDGDMaUxeW7aS8wKGnk
+3OnES3sE0tNQU433y//gUqRbS54+6Pp9kD8a6B22+CxDxHlF/J9SWRSYeKu+cZFG
+l6No1IaL9ETN0bdgxAGGFAcDfzbZgdhaSKEpIub4N/DKlA48fTS1pLlPv/nxTcoL
+nujpUimG3usZX5PV7XXAELt8hVABXecf929oG82IQCeFzn8i0wjO7wWSiO9y12mK
+OJwuJTv3ineMwJR0GHY8bB61cP3JqmtNgj6szszDR4n7Ys9IY+rZktDtPpsueNN5
+Td0uNf7WqDRPKdhHLEr5d6fJry7W92+QSJObT/azV7X1JaoNkGnsl4lrCmmBKuqm
+GbTTHOmNRL24x3eCE89QvDvvpLgDLYmsKce/mwS8Lm/BUHeOBIemihxsdL5rEU21
+bPockNO+o+Eg495CMn6sA1+Yb7QLfw5G/sBj9a0CN7QKK6zccqxSUtGj/VKs+Jdr
+gTtolwoPbj/99Akoy17j
+=Ukqr
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r1.ebuild
new file mode 100644
index 000000000000..b93a4fa78915
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2014 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_beta3-r1.ebuild,v 1.1 2014/04/18 01:30:53 zerochaos Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs versionator distutils-r1
+
+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_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}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
+
+DEPEND="dev-libs/openssl
+	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 [[ ${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 3f660e60e6a3..04dde0abb8c9 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2014 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.8 2014/04/17 19:14:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.9 2014/04/18 01:30:53 zerochaos Exp $
 
 EAPI="5"
 
-inherit toolchain-funcs versionator
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs versionator distutils-r1
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -30,6 +33,8 @@ IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlit
 DEPEND="dev-libs/openssl
 	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? (
@@ -39,7 +44,10 @@ RDEPEND="${DEPEND}
 		sys-apps/usbutils
 		sys-apps/pciutils )
 	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python] )"
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
 
 src_compile() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -56,6 +64,15 @@ src_compile() {
 	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() {
@@ -89,11 +106,11 @@ src_install() {
 
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng"
-		emake prefix="${ED}/usr" install
+		distutils-r1_src_install
 	fi
 	if use airdrop-ng; then
 		cd "${S}/scripts/airdrop-ng"
-		emake prefix="${ED}/usr" install
+		distutils-r1_src_install
 	fi
 
 	#we don't need aircrack-ng's oui updater, we have our own