Wicd revision bump. Fix bug 335393.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 37 insertions, 7 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 2c3118613a34..040a8339125b 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.82 2011/03/19 08:25:24 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.83 2011/03/28 14:02:03 c1pher Exp $
+
+*wicd-1.7.1_beta2-r3 (28 Mar 2011)
+
+  28 Mar 2011; Dane Smith <c1pher@gentoo.org> -wicd-1.7.1_beta2-r2.ebuild,
+  +wicd-1.7.1_beta2-r3.ebuild, +files/wicd-1.7.1_beta2-init.patch:
+  Revision bump & remove old.. Adds patch which addresses bug 335393. 
+  Cantidate for stabilization.
 
   19 Mar 2011; Thomas Kahle <tomka@gentoo.org> -wicd-1.7.1_beta2-r1.ebuild:
   Really remove old revision :(
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index c96f2ab90b7e..ce5551b0ad22 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d
 EBUILD wicd-1.7.0-r1.ebuild 3061 RMD160 bb369b4759c77d5b053886be102865d1aee86a9a SHA1 99a13e4ea0d6491b673aa776e29b095d464edcd4 SHA256 c7f4ab73c526fc2306cfd66e6fbbc663284db3185157f13224d0b3e987832640
 EBUILD wicd-1.7.0.ebuild 2856 RMD160 7ec89bf25620c0d291489812b4455c1326e1e285 SHA1 6395677c5391a67a0c38009c9db6af0668bc68a3 SHA256 f49706e3dd3fed63a3ffd033ed3eaab351a16fe4df17b4bad991399b195f7d64
-EBUILD wicd-1.7.1_beta2-r2.ebuild 3144 RMD160 d44a75073a78bdc3e7ff38d504122f554ba848a0 SHA1 77f06530b3c583256e1d82fa1fcf1e5051a7c2fa SHA256 656ba1d735a37b3e27966e8889cbf307fb67543c1b4aba76e7e7a05132a8ce34
-MISC ChangeLog 14570 RMD160 c7407a738e5c43e525784504faa6ca1c6d59c757 SHA1 98bd8927ffbbaf5a91bdf4881f13932ba1bad568 SHA256 d5da0c7ad0b846a9811983098db092dfa98c0f6580e4df3780c6e84619766a2e
+EBUILD wicd-1.7.1_beta2-r3.ebuild 3183 RMD160 94038fff90744b22749002af5618993a44857d8e SHA1 26f443a9e68545cc0b3a5fa9d5e1c437200974e8 SHA256 ab9df2e4982dc673b0d7c3bf31c43390aeedd90efe68ce32789fcd0fd02ee3e4
+MISC ChangeLog 14852 RMD160 042f6833ece967456eb155386ad90eba6e7f6039 SHA1 adac55bb6fa3e090fa84ec177312ff532499f2dd SHA256 d73d16018df8f210ec92cb907b4c6655088b397fac374864963745a8d77217c3
 MISC metadata.xml 795 RMD160 237424ffc88cb2020c18b063347a41b168fea63e SHA1 a5eab12eb1d22d54b713bd25bf8a6d216c38efe4 SHA256 370e0a1d289a2e54b68f6d9d78a92cdb17b115c1752f6cf8bcee1ea9b93b329e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2EaQwACgkQnZsgo/h8kNa8wgCfXOtVEnF1Uyg+21cN+vvNIt8f
-OuAAoK3KGr/sdHHWgXLy2aGKYaS4AmhS
-=yBm6
+iQIcBAEBAgAGBQJNkJRHAAoJEEsurZwMLhUxAkgP/Rw6CJr+blMII1IxCF7ttXoa
+CmqLMssIbW3EGa+sL6qHinFfNJeuPaNVr2HjqO5xC0rq6uk5/NhmNG2ELxhFx9QB
+/n+M+BBbn2eamVi4uqOg7ijF0/0Mdx1Sgn70zM3TcB80UKlx9fzoV+thkVpdUmhb
++L9PIjd0tgYUBxIttnE+DMOvT/+e9KME22DaLdPajToBJ/1FNnWo5seHYrI/uVrA
+KxkDANLWsFIcA/0a29GZ4WwMRW45IDU5jwOCXmkQsXor8XnCFLyvtQ9s2qM8EPHz
+Dyu7wm39eTR2Lbhi+766YHIUe+tITEECzwCyR1zAMs1jvpH2d/GSMV4lv6VAhq9j
+TuZybEh61NrKfIGZCsgCV3PQr6YW/5N3N7Ec2cDb+Sh/vocdTpuypPxv+39GHkjc
+zv9NGxzgUT+BlXwMFsQDn7PZWn6w2ZHiPIg1qYDHBx0HQhu98K75476ZZED3FTvO
+8mQCM7A8hq3aRgLsBGWd8wTefJXjdYEGV9iXyXDvPzWrXcZuSMB0CtPEDYMVHcuU
+Qml3r6YNoanIZzJdQzOvKqg/8cpTz7vS3OCG/KoYbb2ejRb/zRX/bDLCMPx0iXX1
+ww+4SvUPpdNmKLNMQybtKK7m1frT6QYd8V6TRJm4thkyEI68lyZ9h7Zm7fuL4KLU
++6+bpih0qfsU0eVU3GWG
+=96Jd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
new file mode 100644
index 000000000000..6a736f9e2cdd
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
@@ -0,0 +1,11 @@
+--- in/init=gentoo=wicd.in	2010-10-29 11:36:55.000000000 -0400
++++ in/init=gentoo=wicd.in.new	2011-03-28 09:40:27.245339002 -0400
+@@ -15,7 +15,7 @@
+ start() {
+ 	ebegin "Starting wicd daemon"
+ 	# fix Gentoo bug 296197
+-	sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
++	[ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
+ 	"${WICD_DAEMON}" >/dev/null 2>&1
+ 	eend $?
+ }
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r2.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
index ec7338564c0f..6c20f939d10b 100644
--- a/net-misc/wicd/wicd-1.7.1_beta2-r2.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r2.ebuild,v 1.3 2011/03/19 08:21:32 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.1 2011/03/28 14:02:03 c1pher Exp $
 
 EAPI=3
 
@@ -61,6 +61,7 @@ RDEPEND="
 DOCS="CHANGES NEWS AUTHORS README"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-init.patch
 	python_copy_sources
 }