einfo->elog, remove madwifi references from ~arch

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

3 files changed, 29 insertions, 30 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index b5fc5046a5f7..9f86d5714fe8 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.190 2012/12/03 09:24:51 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.191 2012/12/25 16:08:08 zerochaos Exp $
+
+  25 Dec 2012; Rick Farina <zerochaos@gentoo.org> wpa_supplicant-1.1.ebuild:
+  einfo->elog, remove madwifi references from ~arch
 
 *wpa_supplicant-1.1 (03 Dec 2012)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 9bf4ba057d23..eb3f442a2134 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e SHA512 6d59a0354c57b9dfdd06dce9231b627521d2ed83762994464d700da0d3cf029b4d776ee75393bd9e5753f1e1b57f900f416e582bc44840928426c3c11e7aceb3 WHIRLPOOL cc8cc3c39b686dbaa4dead808448b54f89e9e542d531f341094c0ec572d467a9a87dfd74ef594c82198cf487e7a376600e41bbe21e5940c313bddcbf3329497a
 AUX wpa_cli.sh 1407 SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 SHA512 613345f142f2e87f7ebe9eaf3a9a60f4cee08f50596d307bd9c0acd88d1c470080bd27c645455ae32cb4fb7fe96ae131ee09fd6c7657cc298fc3476e4dfdc059 WHIRLPOOL c7d461efcde44f9ce98e99217ef27ef713082269380d1a45da17a9e679c5d816c156cb5c00665034a88680b241144e7e71c901a7c73bae075dfca7eb55b10ffd
@@ -20,13 +20,23 @@ AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb7
 DIST wpa_supplicant-0.7.3.tar.gz 1638224 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 SHA512 81c633eac9168ac2438ea3ad7505c25dcde98befee8b65ea562b9cc6ee658e998ff147f7646531968edc596d44a38c3acef3e30c43b1db4a8cbeeab22287e888 WHIRLPOOL 594f70b2e4e78a302809ac0b3bf9eccaaba92d8a052efc22184623b1690ade39d418a221933f7f8ba885ee6c59b5a189158db333c2e11e60c8bb51ec68537929
 DIST wpa_supplicant-1.1.tar.gz 1950890 SHA256 a54dbe5cfd47b724d7433366d536f76bbc31efea2df866a8f2f87c86a48b9e02 SHA512 61afeff24d6175feb4c73a6c53f0e88acb32746739febeafc9b834652af6607c339b9fe8ef1e05bc61f6b078f85aa0a35261fc8d02f05a844cfded12c8709901 WHIRLPOOL 9421156fa03e3eb39c4fa575d02d3e2eb546cde2d81193c1ebef9fbf205b9dcd23f830471fb6dd845accd9382c53dfbd1853d52486c5ae25db8317055901e684
 EBUILD wpa_supplicant-0.7.3-r5.ebuild 9001 SHA256 249285c8839b7b6b7a6d46ab7f51ce55652c732d9cdd343242cb1293e6431fd6 SHA512 8b28b2b491e91c7d6290ec03b038fc91b12b07aa6aa8a6349510b3cbf8153778041943d9b7bfcbe1f2a0fa61f0602a2573f71941ee88f8b34e7690cfb61aff00 WHIRLPOOL 4788ca0626c7e2d8b817a341ad920a9e16ebb7a3e82287171e54a8a0feb5573f90696b3383dece0c653f84864ba6bca477b2397a48f4fddd782bfd3e635e2dcf
-EBUILD wpa_supplicant-1.1.ebuild 9480 SHA256 0972a8ce8c0cf2cc25ba655ad4feb09e8c5d5fda596b203a7c3112b43cfcf0c3 SHA512 76fe4ae4aa154b3091582fbbffae413b6fa86c565ebfc28a3917863606e0eb97395a8ac17459864381f88e9d3c7b7d47394a930d7abc7c31ddb4d4523789d74c WHIRLPOOL 8467b75e8a61416a86066d7fe46c02610e9e8e58bbba1b162a4cc6718de3775938a8ff8cb395b3cb71c5e85c79bf3761a70e6c0e869b74fe62ef16eabe87a91b
-MISC ChangeLog 39336 SHA256 9a6a0ee3383571ccf6b6f0dfa08db9fba05118138cc521fd78032f6f246411fe SHA512 366760078c82cd62066c43ceed4ceb0850376e32722aee71ef45cba76bc6c97ff7dd2630c5a78995a78994297d18859518d16c2c5ae070d5b984ad89f60a5c5b WHIRLPOOL c71d1d6c31ab947b96eadcd8e24424ff87d7bd4a2c47a505289089b2f9d7499359154a3d6d1e639f4c8b73cc8a3609d59378425db4d72a6af2276e32006e76e5
+EBUILD wpa_supplicant-1.1.ebuild 9001 SHA256 b23c8401e267144f326dc3090d2872c62287608e299d395cda9b720c5136d17e SHA512 d42f79c6c196848cee35ac1fa9d42c9709a1049b1a7e65a471c1bac4bb86cb8254f042aaf11ed7b0cfa8fd10f51f8c43d9557208dab1a704906b8bf03cdcfc7c WHIRLPOOL 594f69f89c4546fc6f5f5efb05936225084ee57438266ecfa97ce7614a4219539e1707928ae68400d4ac7b8559bf77037df230dad5b7e9e7692db7d44fb09c5b
+MISC ChangeLog 39465 SHA256 dc6f02ca07d25b608713a98c5081319128356db6fa68b2dc2df646d3165dbfa4 SHA512 d0ccef1f7b9f0957f46b654678662e17e270a640805360252d1c9cfda19b07474f0dcff5e137daf7bafb9bb8fa1e3d0ae9782b1db7201ae567c3e03ff490aa15 WHIRLPOOL e70f3599caa99dfc9cfd77a34ba46982a8d19a0c0466b1a4ef75fcdc73111c8bce631a15bbf8ec6e3195f625ca0ca160212048c44da1d4a484a1472f92cea753
 MISC metadata.xml 1024 SHA256 116ac4fba8c2ba21c544dae067ba07ffd9da3ab97c368c849e8f163f8ea082b1 SHA512 7f118689c6a01321700af47926ed8140983f2f5494ad8ef39cbe955f00d2ff6bce9a012658864a0d80bcd08752348b659de01df6eec60b266c1124ab6ca2ca38 WHIRLPOOL 466dbf56b5494e717d7b986f29dffc962c001dfcc9c76af55e2875259241c22e5715c03fc94ac7a509ebf7658e40e6824a3bb2197bc99bb74aa9e3f49c555469
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC8b9gACgkQsR7PQhRXYElQhACggPRZpOezowGrIZySVH6uix/7
-JSoAoIMjTf435vV+2+k6YNJQfMflb3lk
-=43PI
+iQIcBAEBCgAGBQJQ2c+PAAoJEKXdFCfdEflKbwwQALodz9SnjCJNRlu0G8/2R8g3
+YAekPvD2gDvxOfmECehOLLJ+TLgQ+68uEVU8X6gUwj4KSxejF5zfsOM1iKViP7ZD
+cq6TdkLKlTbX85mKhcBu77ekz5p40rsK27vzE5EX+du40f3JHLFaopiCUkLZTa8u
+eUs+6UAd2/IGZOftIhYhQ1zW2TqLCXCHgXN+IqQHyYaGVqv//Ypf/jtlC9ON45Hf
+cJk3Hn+KxhPNZ2F+reBkQ1MufSqL6x3dky8qg2FZ1wD+C4S6aIv3c5IkXNKORdOf
+WNAXAbay5y3RBENHXZwGKOwARePp4w6aPB6/rm6zRsFEBvuIq3VJ/QDPi04Lj84x
+OgnkunU1D4b7yf+qJ5vvmpe8U8uR21rVDO1vQv2obfoYmpX9i67jGh87B6bvpWcN
+OqU+Qvana0nA+6vvotmcpSRIrvvYbU4kCDBrr6RDG/cS0p2LO3FnH5BoS7e0LCG4
+X0GGYSWZR87Xr+u88vmWAd0PMV3v9driwyzvSbd5ylLI8EkbyGfC5n3Rc9KGj9Fe
+XeDrTLxygyFDaHsDAQ+V2QkJ/PEENOt17vIAz+sTCkSIG/i/G05vhANaEQaY0zw4
+61+cfxlPexOB6AfKFkMqIbAvOZ91Zh2QRIXEaGsrbRq7BndtUfUHc16UK11khx5I
+L7LWsoZunhen10MO64HN
+=hsZd
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild
index e29943e30952..795282249998 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild,v 1.1 2012/12/03 09:24:51 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild,v 1.2 2012/12/25 16:08:08 zerochaos Exp $
 
 EAPI=4
 
@@ -13,13 +13,12 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap madwifi p2p ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="fasteap? ( !gnutls !ssl )"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
 		dev-libs/libnl:3
 		net-wireless/crda
 	)
@@ -43,7 +42,7 @@ S="${WORKDIR}/${P}/${PN}"
 
 pkg_setup() {
 	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+		elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
 	fi
 }
 
@@ -175,12 +174,6 @@ src_configure() {
 		echo "CONFIG_DRIVER_WEXT=y"        >> .config
 		echo "CONFIG_DRIVER_WIRED=y"       >> .config
 
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
 		if use ps3 ; then
 			echo "CONFIG_DRIVER_PS3=y" >> .config
 		fi
@@ -299,12 +292,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
+	elog "If this is a clean installation of wpa_supplicant, you"
+	elog "have to create a configuration file named"
+	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
+	elog
+	elog "An example configuration file is available for reference in"
+	elog "/usr/share/doc/${PF}/"
 
 	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
 		echo
@@ -312,13 +305,6 @@ pkg_postinst() {
 		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
 	fi
 
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-
 	# Mea culpa, feel free to remove that after some time --mgorny.
 	local fn
 	for fn in wpa_supplicant{,@wlan0}.service; do