handle unstable->experimental

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

5 files changed, 35 insertions, 28 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/Manifest b/net-wireless/aircrack-ng/Manifest
index 7655f1a635eb..bc0911818640 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -4,24 +4,24 @@ 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-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
+EBUILD aircrack-ng-1.2_rc2.ebuild 3689 SHA256 d6dc5218a298305778ad0f3de393d2614f7ad243a00fde4e2e9119822ba9da2d SHA512 92fdb0c2fecbe8bfbe7668e0f7353d3df76ddcfee66127d3b01b36e24a00ae523b50c54f127cc805b6c6b34278b6b861d5fc0cbfaf14d2dcc56a8de284999db1 WHIRLPOOL 18e5ce1ed578ecc9f0bd8b98e2b3981e4a7545da75fa842304486d6fc3a88720f968eb0bb36c0956bd8796c145dbf1a98da515ccde8cd84310d6e391b9d3c6f8
+EBUILD aircrack-ng-9999.ebuild 3927 SHA256 a771f8803e3433e3bd980c98eed4eb920de834b7142283a9589567591c83b498 SHA512 c559bb75bdaa5f77c6ed8dbf79d5077c245b6bf52f02a6d042dc4693f3ca7f7346f64f2ec17984ab791cfc2464bc3d7e3759417d5c045393d97d02dd97f15c30 WHIRLPOOL 8ac540ab9c95b8253357b2b461d4a29238bb96ba518e0a36b8ac400cb4f2f0308d1f7fc31364a395eb5fe03b7e08775a0f780e61874aff0b5f245db30fa7f624
+MISC ChangeLog 15253 SHA256 d851ad376e9de6917db819ae82f5713a635efedcef9e4225624495e2be6c921d SHA512 26aa62015eed5b8d720da3f86c57b7e0a96692fa88e860857be18d5ccc0780d1e66c36db6360c978b599df5e032a2dde5e279df6a0f03582496d5074ced1ba25 WHIRLPOOL 25e5de2b425286b18d16581dbcfa415ece29a575e689ae011d219921b93497c32af05835362fffef8d48d8a6275debd4d0dc950ec8334fed1f0d38d58ffba7a5
+MISC metadata.xml 922 SHA256 698f3c637ce5738924a9d5a8397cad1d9fa277b8a5a1b9d852d8951b4e55fc0c SHA512 99ae291dc7d6883e841508b4610b1e0d62399b022ec2b9b3b5d322ffe19938b73799f3489d41d793cca6673ca00cf660818cb606516dd6314f1329bdb83a2ba6 WHIRLPOOL cf47f4b35775e21ada2351f4bc93cfd30d82389374446ad8eacfff61c4a37ee8f6bcc086f9a48e8466fada5e5584d372dec46bd859e3305cfe1b4d697f63668f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVRvSnAAoJEKXdFCfdEflKCNIP/2NbNLiVwJ5IeI21qajclEVr
+WjJewUKY7wTsuwAxdJ+a+7KhFkmzn/aiCOpKDK5b/7ZcjzQKdGTtApLfDYiNTaiD
+3X1mON7sxHXq64uTRVkBcAmw8qK/caJj1GWxDuDZG/sQApk1DkKn5dRFx8b8hG06
+GREZfOCHmd63BuhO3N8fut77fybSWPtBEpuLF8b9uWaY+UFqcvLPhjMI05tl1Q8S
+/MgErb4H6a2B5YeYJOW2x4RPrGjIndepMQcjzM22I1rSLQLs90DJxzjQzAdFa2vh
+oe2vGO4YFmqvl2x6X5V1Rzo7r3BxQNiwvmwgOvSrZ/8zznvBMktRCdQkhkaDgt1W
+AutKezMrjFGaN+hypa/SWaVqBfvJ+tFW8L6hGW4JEBFgqKy/45nwSgAiRWGKEQrZ
+tyZlOP6OBF/X6+DH3yGfa5HUOnoyatxZhCv0jGbqPiGf+OaPsVyOsnZlTrv8yOc8
+jgZoXfusIcz/VWo/PgfuepqQh9npB96eB9xG3LYdzcFh/MgagxV2RMhIPnNa5x6K
+HHZwGEwTb9OWoXWc23D+rn7KrsRJz1SGShyZdahRlAEqMnhddmeA6Q/+HrXXgPRS
+AjASogwK1JEUsjvtFCaiMwtm9V2OyvDir4CTBQsHgu9rBZKFrP8AejQ/w2WqMAyN
+1k/jV/ok6MYxLjyKQWxW
+=YazL
 -----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
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>