bump to beta3, ebuild fixes

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

4 files changed, 56 insertions, 110 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index efc6f8545f60..4febe5a4ded9 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.80 2014/03/30 21:36:10 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.81 2014/04/17 19:14:33 zerochaos Exp $
+
+*aircrack-ng-1.2_beta3 (17 Apr 2014)
+
+  17 Apr 2014; Rick Farina <zerochaos@gentoo.org> +aircrack-ng-1.2_beta3.ebuild,
+  -aircrack-ng-1.2_beta1.ebuild, -aircrack-ng-1.2_beta2.ebuild,
+  aircrack-ng-9999.ebuild:
+  bump to beta3, ebuild fixes
 
   30 Mar 2014; Rick Farina <zerochaos@gentoo.org> aircrack-ng-9999.ebuild:
   update live ebuild for pcre
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta1.ebuild
deleted file mode 100644
index fdd8da6ebaa8..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta1.ebuild
+++ /dev/null
@@ -1,93 +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/aircrack-ng/aircrack-ng-1.2_beta1.ebuild,v 1.2 2013/05/27 01:58:19 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=""
-else
-	MY_PV="$(replace_version_separator 2 '-')"
-	MY_P=${P/\_/-}
-	SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	ESVN_WC_REVISION=0
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD netlink +sqlite +unstable"
-
-DEPEND="dev-libs/openssl
-	netlink? ( dev-libs/libnl:3 )
-	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] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake \
-	CC="$(tc-getCC)" \
-	AR="$(tc-getAR)" \
-	LD="$(tc-getLD)" \
-	RANLIB="$(tc-getRANLIB)" \
-	libnl=$(usex netlink true false) \
-	sqlite=$(usex sqlite true false) \
-	unstable=$(usex unstable true false) \
-	REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}/usr" \
-		libnl=$(usex netlink true false) \
-		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
-		REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}" \
-		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-1.2_beta2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3.ebuild
index a5b3e357d511..8c4dbab234a1 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_beta2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_beta3.ebuild
@@ -1,6 +1,6 @@
 # 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_beta2.ebuild,v 1.1 2014/02/04 03:34:12 zerochaos Exp $
+# $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"
 
@@ -13,21 +13,23 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 	ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
 	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
 else
-	MY_PV="$(replace_version_separator 2 '-')"
 	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"
-	ESVN_WC_REVISION=0
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD netlink +sqlite +unstable"
+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? (
@@ -39,31 +41,48 @@ RDEPEND="${DEPEND}
 	sys-apps/hwids
 	airdrop-ng? ( net-wireless/lorcon[python] )"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/aircrack-ng-9999-fix-labels.patch
-}
-
 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) \
-	REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+	${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) \
-		REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}" \
+		${liveflags} \
 		install
 
 	dodoc AUTHORS ChangeLog INSTALLING README
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 7b4d63a334ca..3f660e60e6a3 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2014/03/30 21:36:10 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.8 2014/04/17 19:14:33 zerochaos Exp $
 
 EAPI="5"
 
@@ -42,6 +42,10 @@ RDEPEND="${DEPEND}
 	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)" \
@@ -51,25 +55,34 @@ src_compile() {
 	pcre=$(usex pcre true false) \
 	sqlite=$(usex sqlite true false) \
 	unstable=$(usex unstable true false) \
-	REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+	${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)
+		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) \
-		REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}" \
+		${liveflags} \
 		install
 
 	dodoc AUTHORS ChangeLog INSTALLING README