Add a warning about the default configuration file changing location, #154862

thanks to Mike Auty.
Package-Manager: portage-2.1.2_rc1-r5

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 2235b694bbe05e556a602eb5accf86bce2bc00ff..ffb9b9a9a5bb6e878b821b38e1b37d15c1a3bc54 100644 (file)
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.83 2006/11/10 14:39:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.84 2006/11/12 14:08:04 uberlord Exp $
+
+  12 Nov 2006; Roy Marples <uberlord@gentoo.org>
+  wpa_supplicant-0.5.5.ebuild:
+  Add a warning about the default configuration file changing location, #154862
+  thanks to Mike Auty.
 
   10 Nov 2006; Roy Marples <uberlord@gentoo.org>
   +files/wpa_supplicant-0.5.5-inuse-warning.patch,

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index f50056b459c385ffc71f1456463512e1532248f8..fbeab005c73d9e6ad4c468fe081caa0c48a8b21a 100644 (file)
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -33,14 +33,14 @@ EBUILD wpa_supplicant-0.5.4.ebuild 5453 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e703
 MD5 976dc6af9ca858f57004edd19a1ff902 wpa_supplicant-0.5.4.ebuild 5453
 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e70305a1de0 wpa_supplicant-0.5.4.ebuild 5453
 SHA256 0bf236255f218eefe9a1b42ab02cb1c3df0dc9b950fa3220ae38d99404c54454 wpa_supplicant-0.5.4.ebuild 5453
-EBUILD wpa_supplicant-0.5.5.ebuild 5973 RMD160 7325bbbdd8fd3639762596e4a0f181d1f13f4953 SHA1 e2c87c6cb53c229572fc90d7ef237e3024973482 SHA256 fe1d1f8a8638d1e6f4f3ded9fa50b457a14fa85030c8babe8069f4530b52dc16
-MD5 9c439509dfba2ecaa74e3eda17c95dda wpa_supplicant-0.5.5.ebuild 5973
-RMD160 7325bbbdd8fd3639762596e4a0f181d1f13f4953 wpa_supplicant-0.5.5.ebuild 5973
-SHA256 fe1d1f8a8638d1e6f4f3ded9fa50b457a14fa85030c8babe8069f4530b52dc16 wpa_supplicant-0.5.5.ebuild 5973
-MISC ChangeLog 19195 RMD160 4834a42f24159f0e669d46b2eaad2fe2a1f65ea6 SHA1 46e91026ecfc57e8c41010b549675616104d7f38 SHA256 b4b42f989e2bc645a9e4020ef54342a17005b8e890190e720b1f936fc29eb85d
-MD5 f05a5cd123bcdce08ccd075d863792bd ChangeLog 19195
-RMD160 4834a42f24159f0e669d46b2eaad2fe2a1f65ea6 ChangeLog 19195
-SHA256 b4b42f989e2bc645a9e4020ef54342a17005b8e890190e720b1f936fc29eb85d ChangeLog 19195
+EBUILD wpa_supplicant-0.5.5.ebuild 6190 RMD160 c5bbede293fb14c6975802b4f87acedaf9bd56af SHA1 6b154b330546842fe65b53ff422e6d3c02d87628 SHA256 75c70cb803711e318217eef13600370a1af32e3045d8c8e8a78075d2462ee2c0
+MD5 bdaa9579901b28dd7979bed86d5f2d86 wpa_supplicant-0.5.5.ebuild 6190
+RMD160 c5bbede293fb14c6975802b4f87acedaf9bd56af wpa_supplicant-0.5.5.ebuild 6190
+SHA256 75c70cb803711e318217eef13600370a1af32e3045d8c8e8a78075d2462ee2c0 wpa_supplicant-0.5.5.ebuild 6190
+MISC ChangeLog 19379 RMD160 52b2d006faff4da95fa049315678b6ea2d317217 SHA1 94ba75daeb71045b8c85be9a05d5e29cd5671c9a SHA256 44789b4aba581229d729f2c7ef9a4eda3e95c4448dac3a29d3cd2c0bd8c637ea
+MD5 d057dcbe350881884523d83fb3b0d0fb ChangeLog 19379
+RMD160 52b2d006faff4da95fa049315678b6ea2d317217 ChangeLog 19379
+SHA256 44789b4aba581229d729f2c7ef9a4eda3e95c4448dac3a29d3cd2c0bd8c637ea ChangeLog 19379
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
index f3d63e7b65b75b754607e79d5c61f3e650213bc5..9d09e45def2249679df43344213153c5cb67021a 100644 (file)
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5.ebuild,v 1.12 2006/11/10 14:39:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.13 2006/11/12 14:08:04 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -197,8 +197,14 @@ pkg_postinst() {
        einfo "An example configuration file is available as"
        einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
 
+       if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
+               echo
+               ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
+               ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
+       fi
+
        if use madwifi; then
-               einfo
+               echo
                einfo "This package now compiles against the headers installed by"
                einfo "the madwifi driver. You should reemerge ${PN} after"
                einfo "upgrading your madwifi driver."