handle unstable->experimental

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

4 files changed, 18 insertions, 11 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 6b5d0a46a2ae..b5f690c71775 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,10 @@
 # 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.92 2015/05/04 04:14:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.93 2015/05/04 04:24:59 zerochaos Exp $
+
+  04 May 2015; Rick Farina <zerochaos@gentoo.org> aircrack-ng-1.2_rc2.ebuild,
+  aircrack-ng-9999.ebuild, metadata.xml:
+  handle unstable->experimental
 
 *aircrack-ng-1.2_rc2 (04 May 2015)
 
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild
index fc8c39ad7a94..ce58984dbe49 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.2_rc2.ebuild,v 1.2 2015/05/04 04:24:59 zerochaos Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	dev-libs/openssl:0=
@@ -35,6 +35,7 @@ DEPEND="net-libs/libpcap
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
 	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
 	sqlite? ( >=dev-db/sqlite-3.4 )"
 RDEPEND="${DEPEND}
 	kernel_linux? (
@@ -66,7 +67,7 @@ src_compile() {
 	libnl=$(usex netlink true false) \
 	pcre=$(usex pcre true false) \
 	sqlite=$(usex sqlite true false) \
-	unstable=$(usex unstable true false) \
+	experimental=$(usex experimental true false) \
 	${liveflags}
 
 	if use airgraph-ng; then
@@ -88,7 +89,7 @@ src_test() {
 		libnl=$(usex netlink true false) \
 		pcre=$(usex pcre true false) \
 		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
+		experimental=$(usex experimental true false) \
 		${liveflags}
 }
 
@@ -102,7 +103,7 @@ src_install() {
 		libnl=$(usex netlink true false) \
 		pcre=$(usex pcre true false) \
 		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
+		experimental=$(usex experimental true false) \
 		${liveflags} \
 		install
 
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 6adf9b496911..4dd843ab23e7 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-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.12 2015/05/04 04:14:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.13 2015/05/04 04:24:59 zerochaos Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	dev-libs/openssl:0=
@@ -41,6 +41,7 @@ DEPEND="net-libs/libpcap
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
 	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
 	sqlite? ( >=dev-db/sqlite-3.4 )"
 RDEPEND="${DEPEND}
 	kernel_linux? (
@@ -72,7 +73,7 @@ src_compile() {
 	libnl=$(usex netlink true false) \
 	pcre=$(usex pcre true false) \
 	sqlite=$(usex sqlite true false) \
-	unstable=$(usex unstable true false) \
+	experimental=$(usex experimental true false) \
 	${liveflags}
 
 	if use airgraph-ng; then
@@ -94,7 +95,7 @@ src_test() {
 		libnl=$(usex netlink true false) \
 		pcre=$(usex pcre true false) \
 		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
+		experimental=$(usex experimental true false) \
 		${liveflags}
 }
 
@@ -108,7 +109,7 @@ src_install() {
 		libnl=$(usex netlink true false) \
 		pcre=$(usex pcre true false) \
 		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
+		experimental=$(usex experimental true false) \
 		${liveflags} \
 		install
 
diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index d5f6f968d499..21bff513b018 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -16,6 +16,7 @@
 <use>
 	<flag name="airdrop-ng">Build airdrop-ng</flag>
 	<flag name="airgraph-ng">Build airgraph-ng</flag>
+	<flag name="experimental">Build the "experimental" tools which may randomly fail to run properly</flag>
 	<flag name="netlink">Use netlink for channel control instead of WEXT</flag>
 	<flag name="unstable">Build the "unstable" tools which may randomly fail to run properly</flag>
 </use>