work-around for http://trac.aircrack-ng.org/ticket/1144

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

5 files changed, 39 insertions, 139 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 1429594bfdcf..ff1286c94ab2 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.82 2014/04/18 01:30:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.83 2014/07/18 03:41:02 zerochaos Exp $
+
+*aircrack-ng-1.2_beta3-r2 (18 Jul 2014)
+
+  18 Jul 2014; Rick Farina <zerochaos@gentoo.org>
+  +aircrack-ng-1.2_beta3-r2.ebuild, -aircrack-ng-1.2_beta3-r1.ebuild,
+  -aircrack-ng-1.2_beta3.ebuild, aircrack-ng-9999.ebuild:
+  work-around for http://trac.aircrack-ng.org/ticket/1144
 
 *aircrack-ng-1.2_beta3-r1 (18 Apr 2014)
 
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index c365ae452d64..5586dbf28cd2 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -19,25 +19,24 @@ 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 3511 SHA256 d646c8faa2b80e7054834e2a2c961ae1a2c3fb4ec22f2c5d483ad83a0d0758c9 SHA512 b8f953a23ec8032b4139703c1177a807725b75a6487b5622620fd5eb89f25767f3d442b94baccc482c948366db63b25a9760230041f8d5e57e7bf3bad561ac1d WHIRLPOOL 0d2f3c48c0255d45b6160cf421e26796cb3a01841ccd2e1090ccbef1c6cb1be116a250dcb00d61545c639fdf70cdfd1611ead6c150023f7cf078ad07b9987159
-MISC ChangeLog 12897 SHA256 15e8786bcd3b040af8483c4900097b2d68d953bdd126058135bee3e69ee27ed5 SHA512 1743c5dddeb2def34e2e28eae24d599ebbf2bd407bae767642b1fa5d6a5ab96c160eaa7b2570765979adff4341a250fd28a06f1c9781cd757bb41340a5b60843 WHIRLPOOL c34ca2844d431bbd9306eb8dc92217109a2ef7bffac5db6b06a9cc5a4dbcc1e947f2ec2f0d6384d451483348b930d773b209946117f8544ec316b9f60e76753d
+EBUILD aircrack-ng-1.2_beta3-r2.ebuild 3689 SHA256 b6efeaf9b93580352ab2aafc695a5d4771e2bc31d89c2a648229ca2a45727e8b SHA512 0ddb0336ca0aa70eee1245b6ad34c258bb4869c9a0309d6e48875ec2cf5c6a267b9ca71113b00497ef88fd3e4e1084bafc447adc3ceffa5ccc28fe5286655f0b WHIRLPOOL d7fc5b7431bcef3acd95304699efb2b6e160f42c494367c200ef7bca25a5cbccffcb767f808715707d579836a27fa0b187c98bea3c2deedc5599fe3b664ecbef
+EBUILD aircrack-ng-9999.ebuild 3682 SHA256 465ea65b41e0e244028bd03a7cd0c314f1f205138a3153ab341419da6824e553 SHA512 ec2a57a639cfa82957c48cc3495578d938a7325d5d0dbb2191054e4a0c0e743faa57293a24894139fcdc59bb149c0dbccb813b1dbc80dded451d34684b5249ca WHIRLPOOL 2060d7253685519217064952b1ce92415eae772157af80f66575f64a6cff6d90cd434a20a30de4948f8649411fa4166520d139ec18ee43a6688381ee6fb1c4e6
+MISC ChangeLog 13175 SHA256 adc1afdc4b72dc9c93c10afb12f1a9d39278d1a65ebb20dbd26de3b2759021fa SHA512 c799c73d529da4debc46509d0d4a3157530fea34c9af4728f992b7421ddbc0e2fcb32113029ba6fcaecf6b35319bc9ce5f88d0a1039c266bcb332634b8e60a9a WHIRLPOOL 69d0c43f9c85bd1bf78e26589650d9ef5b7a7decba88551a9eecfc38519c520675cde8500625e4328e7dccad20faca7df89e60f25e70dc2199a5b311e8d6dced
 MISC metadata.xml 817 SHA256 9cb2b1c61779baaa8c53ad94a131334dcc380c365e3ce2a91cf4a2391edafa5b SHA512 e481c5eefbee13b7ea53900db1fba01cac98bb2213d01365f264cdeade3ce84b0c14021a0817b3269c03fad9e45b9164726ce14812cf704133191779c6b7ea8e WHIRLPOOL 95479f33ae3e88505a77f8ac8246a35dd29b60e2ee57262c043c880d1a8f34c3aa4c45db6aace401799ef749d55ba5528eb0d3b9ef2b6d8315e0805f7b9fe223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-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
+iQIcBAEBCgAGBQJTyJgoAAoJEKXdFCfdEflKMeIQAJdIhA3dE2F0FMl0ara4oHvy
+TDexBu6sY0gdCh9yQnzox24JxJelyYnsDBv9cOjmo73em7zqgCsMZpeUmaPdwjJj
+aIU6uihpESmKc/asfkydDQlUAILPYrF7AOqC/WJ0I2r8CPi4Os0M4/ir+cOERuGD
+1Ul+OPxsdpHvFOJRZH2vFDxvk+xglAjMKJBVkkk/1yR19xmkOJDEdmdQ4FRpCRd6
++pWon9TUigmvKINf8CpiT6m1Ekcp5zbcjNi+ExA+F7u4FfgpL76yJyzh7i2OeKzV
+i+DV8dHOtk2GS/GEVpDB6z2jui3eeEEBmwo9MHhWGde7XmiIx/Q8laQgbrD1ma58
+zH7jHy/nwhm94Vx/UR2AWe5OPwPC4Q6zq/NtzTSX0vF4OaAJMVP7n/fDsKEZ57aA
+FTLfUIc21W1n3xxrOKxbCUObbjSscPoH3w2IFouiqpDiqqHtFV3PKHVn9IEw7g8a
+jFrym/l1bygghMNis8gu8qdKfNF544j2lS2BZMRZG66GZl5gJGy69VWT3mYh+yBS
+optuTYdamVCrP3xLR6p+rWWPJyByUMkeD5MAr2Wkn82jj9v71EU1Y7D/Zi473bDq
+9YlZlnA99q6QNQkjOY56z2p7xJZdS9ZP8M/U5qUXrUcmsyW8ESfx8rfHqGUpdzFu
+pb4k+gfTgdUyY3FP/Ji3
+=hpt9
 -----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-r2.ebuild
index b93a4fa78915..d4a0dc7db1c9 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r2.ebuild
@@ -1,13 +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-1.2_beta3-r1.ebuild,v 1.1 2014/04/18 01:30:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3-r2.ebuild,v 1.1 2014/07/18 03:41:02 zerochaos Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit toolchain-funcs versionator distutils-r1
+inherit toolchain-funcs versionator distutils-r1 flag-o-matic
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -50,10 +50,15 @@ 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
 
+	replace-flags -Os -O2
 	emake \
 	CC="$(tc-getCC)" \
 	AR="$(tc-getAR)" \
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3.ebuild
deleted file mode 100644
index 8c4dbab234a1..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.ebuild,v 1.1 2014/04/17 19:14:33 zerochaos Exp $
-
-EAPI="5"
-
-inherit toolchain-funcs versionator
-
-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 )
-	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] )"
-
-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}
-}
-
-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"
-		emake prefix="${ED}/usr" install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		emake prefix="${ED}/usr" 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 04dde0abb8c9..019385b7bff2 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
 # 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.9 2014/04/18 01:30:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.10 2014/07/18 03:41:02 zerochaos Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit toolchain-funcs versionator distutils-r1
+inherit toolchain-funcs versionator distutils-r1 flag-o-matic
 
 DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
 HOMEPAGE="http://www.aircrack-ng.org"
@@ -50,10 +50,15 @@ 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
 
+	replace-flags -Os -O2
 	emake \
 	CC="$(tc-getCC)" \
 	AR="$(tc-getAR)" \