Changing use flag gsm to eap-sim, fixing half of bug #254677

Package-Manager: portage-2.2_rc31/cvs/Linux i686

9 files changed, 49 insertions, 34 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3a558fc5923a..d814ffc2b2f0 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.116 2009/04/21 09:09:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.117 2009/05/05 21:13:20 gurligebis Exp $
+
+  05 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org> metadata.xml,
+  wpa_supplicant-0.5.7, wpa_supplicant-0.5.8, wpa_supplicant-0.5.10,
+  wpa_supplicant-0.6.3, wpa_supplicant-0.6.4, wpa_supplicant-0.6.9:
+  Changing use flag gsm to eap-sim, fixing half of bug #254677
 
   21 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   wpa_supplicant-0.6.4.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index d9a6db98599e..5b4f5d7fedf2 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 8bf3cc3e970a039c282ca8e01d3096273f1d19f7 SHA256 1d64d21d9a38a41665b054775bfa77c3c3849d2d60d30575434c77b3630ff52f
 AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8
 AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db261e8fdcb5754d SHA1 f676db4ff6938b043e654e876c8976223b181b7d SHA256 e71a75a2a16741598d7f4588537e147271e960c1d0f9991ce9e0734850ef9944
@@ -10,11 +13,18 @@ DIST wpa_supplicant-0.5.8.tar.gz 714467 RMD160 322cd5cba8afffe8343bd8c574e8941fd
 DIST wpa_supplicant-0.6.3.tar.gz 952273 RMD160 4aa954040e3eae572fe600fda8587885e1fface1 SHA1 0e15731bb3fc5c84a1292d665afd53e2fc176998 SHA256 f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
 DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38af3fe7d SHA1 c17a992bdcbe0d2427f0968c5a921e54cf28306f SHA256 0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
-EBUILD wpa_supplicant-0.5.10.ebuild 6580 RMD160 66358e7c289fab065e57adc66ea50c38f2334afb SHA1 57f19c8c4e29ba6781c1531efffaa8939241e0a8 SHA256 f9bcabdc160c97262784bc5941c7aea8419257bccac6f3191489b23fba063bd4
-EBUILD wpa_supplicant-0.5.7.ebuild 6314 RMD160 3561801836964d581a4fa611ba16a26d8840dc0e SHA1 3c38d29c923e7849f099a41a87dc5482f2061b5c SHA256 0faedd572173bb788f07914158fc535579e72b443f9e74779295a2ab1cd9b48c
-EBUILD wpa_supplicant-0.5.8.ebuild 6274 RMD160 bdb4e4c150f081a39aa44b520df82384b0120c8b SHA1 102faf08c273a62fff18105d0bae165c82802248 SHA256 db380ed91e59e99c316030e154192e997ee7a3b05c15119dac48e5c2bbf27068
-EBUILD wpa_supplicant-0.6.3.ebuild 6550 RMD160 58e54ca17c86e42b484c425413b249c012630145 SHA1 c8d45349ef85064da22c74076908964816694e3c SHA256 34e1d85690f0fb8bc184ff65ceca76595f56fffffaac862253ace7d2e49813d0
-EBUILD wpa_supplicant-0.6.4.ebuild 6694 RMD160 ac70e194d2bd8f70d7a6d037966f07af8f89ef5c SHA1 b9eeea6bea24f26398e754dea726c81c3a10491a SHA256 1a54ff6ec230e3a3dfc8c665a6a96ba9848580a2becfb4d602bff6b9c36f5cde
-EBUILD wpa_supplicant-0.6.9.ebuild 6884 RMD160 dec79529315be59e8aa6073ee95f42e71850bdb2 SHA1 14e615f476e4c24a9d054f09be17a793adc7b35e SHA256 4f0d2f99a2eb4ba63a1286fdcf9588328225829714e5f0e157e098b31fc8730d
-MISC ChangeLog 25175 RMD160 9e141bb6ef43c5ff576c715632918919c8e5ffbf SHA1 5d086c7ef347397b37cb5e14033de3f656e8c0c1 SHA256 c6c9c90bb2aa0922df312b80b41bc83b2b23dbe1ebc00e7c7cf81a1fd1f1fc1e
-MISC metadata.xml 567 RMD160 d80753be048613d751f030d90d264a3cd0a36f65 SHA1 f9235195654bb8f3782f47b45cbd930437efdd9f SHA256 b6765ad39d0f561bfb62d1777da0bd962f65c4d2917d08ab9e1edb330e14283c
+EBUILD wpa_supplicant-0.5.10.ebuild 6595 RMD160 e7e75759a33d8f5e644918f3a52e162bb51f825a SHA1 940d5c66bd325d3a5ea76a392e8435a1eac6003f SHA256 364f680b9e9e795f3c2c54ae57b5bd4cf1a1168136016193f77d3d632a245792
+EBUILD wpa_supplicant-0.5.7.ebuild 6329 RMD160 0aed14875974e8b696a872328fffe5cad2beebbf SHA1 170c32870860ae0278b52fce61d2da104b0dd3f0 SHA256 6c55c20a3bbc0bc48b0eaee71775fb238299a28e0a12aa706d07b4343c6c3178
+EBUILD wpa_supplicant-0.5.8.ebuild 6289 RMD160 4c656f7f675f8ed1610da6ecc91895228db47420 SHA1 98d8e97dd2290812d3969f41e4081f6f2414afff SHA256 dda3a969516ec52fc8c52a0c1bcc0076eb128ed0a7893f72337d5ffc82629ce3
+EBUILD wpa_supplicant-0.6.3.ebuild 6565 RMD160 4a235424a74e4b8ccd0bc6bc645332fe0b2bb2b8 SHA1 08bbed20b1e894af246f6d7365aa777280879c75 SHA256 edcc845695c6515fb35cb430d7c9b678fff9b9459de2908b9a7955547dca746d
+EBUILD wpa_supplicant-0.6.4.ebuild 6709 RMD160 5be6f93f12fabf7328020f8acc82362aaa75fe59 SHA1 931c3150ff167647b3f52c87722485cc7f164b77 SHA256 6c411291a5bab03dff96ad6b5b5986f13c1f54883191180886819fc620980e6b
+EBUILD wpa_supplicant-0.6.9.ebuild 6896 RMD160 0723c6a023b576cb00653fd4b101a4c5bb8d23a0 SHA1 d2d80264cb540ad0f0d6fde33916cf1f39bdd4ee SHA256 6c30c55453f8df5654d6ce971dfd174e2f4f47eb346c5db89e8a197ef3d2425c
+MISC ChangeLog 25455 RMD160 f58116f78fcee3fa7c446c2a29e472216bf1399d SHA1 17aceb723e8048b5b47d8e779e4f981d9aafe49c SHA256 2a6633a2a13fa899ebc79265165148618c3c455a61711c9e16d50de0adcb9ecb
+MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoAq/sACgkQsR7PQhRXYEmLigCcC6hoTMM/w/ssFGhTQ5SY8S5j
+thkAnAvHlZNzVubkRsk0mDQ0q5wvA4q9
+=rQcm
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index eafa29d26321..8a9e4de0af3f 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<herd>mobile</herd>
 	<use>
-		<flag name='gsm'>Add support for EAP-SIM authentication algorithm</flag>
+		<flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag>
 		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
 		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
index 74677d841eb1..24a0dc43e07e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild,v 1.5 2009/03/30 16:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild,v 1.6 2009/05/05 21:13:20 gurligebis Exp $
 
 EAPI="1"
 
@@ -13,11 +13,11 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+IUSE="dbus gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
+			eap-sim? ( sys-apps/pcsc-lite )
 		 	madwifi? ( ||
 				( >net-wireless/madwifi-ng-tools-0.9.3
 				net-wireless/madwifi-old )
@@ -90,7 +90,7 @@ src_unpack() {
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
 		echo "CONFIG_EAP_AKA=y" >> .config
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
index 00670c4aeb3a..ee0ec51b7d70 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.12 2009/03/30 16:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.13 2009/05/05 21:13:20 gurligebis Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,11 +11,11 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+IUSE="dbus gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
+			eap-sim? ( sys-apps/pcsc-lite )
 		 	madwifi? ( ||
 				( >net-wireless/madwifi-ng-tools-0.9.3
 				net-wireless/madwifi-old )
@@ -82,7 +82,7 @@ src_unpack() {
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
 		echo "CONFIG_EAP_AKA=y" >> .config
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild
index 96ab0c734192..0fb95faa07ab 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild,v 1.7 2009/03/30 16:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild,v 1.8 2009/05/05 21:13:20 gurligebis Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,11 +11,11 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+IUSE="dbus gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
+			eap-sim? ( sys-apps/pcsc-lite )
 		 	madwifi? ( ||
 				( >net-wireless/madwifi-ng-tools-0.9.3
 				net-wireless/madwifi-old )
@@ -80,7 +80,7 @@ src_unpack() {
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
 		echo "CONFIG_EAP_AKA=y" >> .config
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild
index 4704a49a3cb9..48e9d5b77c1d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild,v 1.4 2009/03/30 16:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild,v 1.5 2009/05/05 21:13:20 gurligebis Exp $
 
 EAPI="1"
 
@@ -13,12 +13,12 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD
+IUSE="dbus gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD
 	  ps3"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
+			eap-sim? ( sys-apps/pcsc-lite )
 		 	madwifi? ( ||
 				( >net-wireless/madwifi-ng-tools-0.9.3
 				net-wireless/madwifi-old )
@@ -94,7 +94,7 @@ src_unpack() {
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
 		echo "CONFIG_EAP_AKA=y" >> .config
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
index 5fc9aa8e5b36..c41bd82e6ed3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.6 2009/04/21 09:09:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.7 2009/05/05 21:13:20 gurligebis Exp $
 
 EAPI="1"
 
@@ -13,12 +13,12 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux
+IUSE="dbus debug gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux
 	kernel_FreeBSD ps3"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
+			eap-sim? ( sys-apps/pcsc-lite )
 		 	madwifi? ( ||
 				( >net-wireless/madwifi-ng-tools-0.9.3
 				net-wireless/madwifi-old )
@@ -95,7 +95,7 @@ src_unpack() {
 		echo "CONFIG_DEBUG_FILE=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# smart card authentication
 		echo "CONFIG_EAP_SIM=y" >> .config
 		echo "CONFIG_EAP_AKA=y" >> .config
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
index 98243fc8a88c..4f45c72e566b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.1 2009/04/15 21:45:22 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.2 2009/05/05 21:13:20 gurligebis Exp $
 
 EAPI="2"
 
@@ -13,12 +13,12 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus debug gnutls gsm madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
 
 DEPEND="dev-libs/libnl
 	dbus? ( sys-apps/dbus )
 	kernel_linux? (
-		gsm? ( sys-apps/pcsc-lite )
+		eap-sim? ( sys-apps/pcsc-lite )
 		madwifi? ( ||
 			( >net-wireless/madwifi-ng-tools-0.9.3
 			net-wireless/madwifi-old )
@@ -101,7 +101,7 @@ src_configure() {
 		echo "CONFIG_DEBUG_FILE=y" >> .config
 	fi
 
-	if use gsm ; then
+	if use eap-sim ; then
 		# Smart card authentication
 		echo "CONFIG_EAP_SIM=y"       >> .config
 		echo "CONFIG_EAP_AKA=y"       >> .config