Fix bug 394309 and download URI

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

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 3b715227b84779c640dae7fef85ae4e7ae890e02..36f92db0895cd868971436646c7ba8b036cb4858 100644 (file)
--- 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.102 2011/12/11 10:21:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.103 2011/12/30 09:42:08 tomka Exp $
+
+*wicd-1.7.1_pre20111210-r1 (30 Dec 2011)
+
+  30 Dec 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.1_pre20111210.ebuild,
+  +wicd-1.7.1_pre20111210-r1.ebuild,
+  +files/wicd-1.7.1_pre20111210-fix-config-reading.patch:
+  Fix bug 394309 and download URI
 
   11 Dec 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.1_pre20111210.ebuild:
   ewarn updated again. Thanks to Jeff Kowalczyk and Nikolaj Sjujskij for

diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index db1a808da6cad281a1c5b1b2f843df0c632ae3f6..cbde90b9adbb02401754b11f90ce305d3d66d174 100644 (file)
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -5,6 +5,7 @@ AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c
 AUX fix-ad-hoc-networking.patch 729 RMD160 4e2a7b36eade357aa7fcd83b8d37e4ec9052212e SHA1 60b69e24e06f10e6d8dce99c6f89c33db79d644a SHA256 1e476d6fe340bc652c747e544b8795f5f01d5c899986fe179ba370a167a441f4
 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
 AUX wicd-1.7.1_beta2-urwid-1.0.patch 895 RMD160 13aec910e261d4f5574a9aebc365570b03089fe5 SHA1 db2b6a4811a9413ca4d8137bd387fdfdee4e718a SHA256 2988afdd35f7d9d0d374ce523a9c4ed193e25e70fd6eb2e9a05ec8b520e952ff
+AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921cbfa1f9d51a88bbbcfb0a87c SHA1 cd964628f71c972ab1c6ca34946f4a3a30e0b255 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3
 AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
 AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
@@ -17,13 +18,14 @@ EBUILD wicd-1.7.1_beta2-r3.ebuild 3189 RMD160 43882aa0a12763d365b129f0b41d60183a
 EBUILD wicd-1.7.1_beta2-r4.ebuild 3421 RMD160 d891106aac02d2ee7d522d282228f303a5ded42d SHA1 a9357a7e76c6aeddccfc734dfe2e1d8b815997a3 SHA256 4c96591a81bb214784bee57204a536c686d7994455caa2661d0037b847a2e6e8
 EBUILD wicd-1.7.1_beta2-r6.ebuild 3708 RMD160 ba67bba58b735fbe9e94c647daa7e1c5fcb1dcd0 SHA1 1e4e02b5fe5c9afe70193ec8abc115aa188b105f SHA256 992380f2c2eda1626ad776775789cb5d26339f0c13f8b7f23ed76d9d4d7d06bd
 EBUILD wicd-1.7.1_beta2-r7.ebuild 3828 RMD160 b25508635ea8126dc4342a83c3882143e4d852a3 SHA1 a76487ba54593685086aa41501a378c938ceb8a9 SHA256 9fb851ad613e00933d0ab40c45660e534b5ed5cc84df97b6c6be1bc4d080320b
-EBUILD wicd-1.7.1_pre20111210.ebuild 3972 RMD160 f149b141f9f456ebb03bc17b979e0df2574f68d9 SHA1 c2b4a3b4802b31bea53955b6e8ddc57201e7d6f8 SHA256 01c33e0edada12cc540076b2407594d91075ccaa16c7d2db832ac89f28f5fba9
-MISC ChangeLog 18205 RMD160 751a23dbe20aa93d2c3e2c2a03da005697981dbd SHA1 36eeb608cf81e9677c61db3d1927e3433e91967e SHA256 92e71bb7ba05be036ca1d6afa3a933f2c97e7d902da25e41efaeb9a5936dbb92
+EBUILD wicd-1.7.1_pre20111210-r1.ebuild 4044 RMD160 1e78ff751788e6a55225d6cb46309baf9c07ce26 SHA1 6b4515ec64663f9c262587c1e4f60838e67f2857 SHA256 5558f67370b85e6a57ff4ea2f770bdfdbdcde7f52ef29905e8665143a1a6153b
+EBUILD wicd-1.7.1_pre20111210.ebuild 3971 RMD160 35d6fb270846bfef47e97f0112ba1c00ddfe2a6f SHA1 8d608a0e34afed50fd37d56316439c4838248389 SHA256 699ad3d6cd9f5642f46d822fa36dbb57432f77018092b78291861f6f3dc13686
+MISC ChangeLog 18455 RMD160 8ebd30b0007e95ebf370d952c55c16e1f4bcf339 SHA1 b1fb5ebee1cd1918baf2778222116cbfdc45f055 SHA256 651cfb79a6273f70643aef886c3c68277d23bde5b0eed1317dd4ef6054f8c226
 MISC metadata.xml 772 RMD160 cd1d29b51de28c4501e022e6942d9fe0fe9f762c SHA1 a8a5175a252ea52293b05ebef2f1bc3c9e1e72a7 SHA256 4695ac9cbb5686a32f8a673bb86c47f8d13507fe86baab8838034085c7e06e2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7khCQACgkQodBTJSDyo64DDgD/de/9Eq96Je45jANOaU9IrVcd
-kUJuWyxsQEB0BFWp9pYA/ROicfSUgmOmeR2x85bRiqTmM3JP5KeY1R9T59qxb7hG
-=REyZ
+iF4EAREIAAYFAk79h3UACgkQodBTJSDyo64YXwD/UR71Bvh+n6GNH8snO3zW2sdg
+2g9HNimJnxPN4lbWAmQA/2IKRd4LM678UmLeq4donnSFsGUQl2R+oP7qiSt9dfgZ
+=FKB7
 -----END PGP SIGNATURE-----

diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
new file mode 100644 (file)
index 0000000..987113b
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
@@ -0,0 +1,13 @@
+=== modified file 'wicd/configmanager.py'
+--- wicd/configmanager.py      2011-12-08 17:56:03 +0000
++++ wicd/configmanager.py      2011-12-11 19:41:57 +0000
+@@ -37,7 +37,7 @@
+     conf = open(path)
+     newconf = ''
+     for line in conf:
+-        if '[' not in line or '=' not in line:
++        if '[' in line or '=' in line:
+             newconf += line
+     conf.close()
+     conf = open(path, 'w')
+

diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild
new file mode 100644 (file)
index 0000000..a6b8971
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild
@@ -0,0 +1,121 @@
+# 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_pre20111210-r1.ebuild,v 1.1 2011/12/30 09:42:08 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+MY_PV="${PN}-1.7.1"
+S="${WORKDIR}/${MY_PV}"
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
+
+DEPEND=""
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+       dev-python/dbus-python
+       X? ( gtk? ( dev-python/pygtk
+               || (
+                       x11-libs/gksu
+                       kde-base/kdesu
+                       )
+               )
+       )
+       || (
+               net-misc/dhcpcd
+               net-misc/dhcp
+               net-misc/pump
+       )
+       net-wireless/wireless-tools
+       net-wireless/wpa_supplicant
+       || (
+               sys-apps/net-tools
+               sys-apps/ethtool
+       )
+       !gtk? ( dev-python/pygobject:2 )
+       ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+       libnotify? ( dev-python/notify-python )
+       ncurses? (
+               dev-python/urwid
+               dev-python/pygobject:2
+       )
+       pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+       "
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+       epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+       # Fix bug 394309
+       epatch "${FILESDIR}"/${P}-fix-config-reading.patch
+       # Add a template for hex psk's and wpa (Bug 306423)
+       epatch "${FILESDIR}"/${P}-wpa-psk-hex-template.patch
+       # get rid of opts variable to fix bug 381885
+       sed -i "/opts/d" "in/init=gentoo=wicd.in"
+       # Need to ensure that generated scripts use Python 2 at run time.
+       sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+         -i setup.py || die "sed failed"
+       python_copy_sources
+}
+
+src_configure() {
+       local myconf
+       use gtk || myconf="${myconf} --no-install-gtk"
+       use libnotify || myconf="${myconf} --no-use-notifications"
+       use ncurses || myconf="${myconf} --no-install-ncurses"
+       use pm-utils || myconf="${myconf} --no-install-pmutils"
+       configuration() {
+               $(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+       }
+       python_execute_function -s configuration
+}
+
+src_install() {
+       distutils_src_install
+       keepdir /var/lib/wicd/configurations \
+               || die "keepdir failed, critical for this app"
+       keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+               || die "keepdir failed, critical for this app"
+       keepdir /var/log/wicd \
+               || die "keepdir failed, critical for this app"
+       use nls || rm -rf "${D}"/usr/share/locale
+       systemd_dounit "${S}/other/wicd.service"
+}
+
+pkg_postinst() {
+       distutils_pkg_postinst
+
+       elog "You may need to restart the dbus service after upgrading wicd."
+       echo
+       elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
+       elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
+       elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+       elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+       # Maintainer's note: the consolekit use flag short circuits a dbus rule and
+       # allows the connection. Else, you need to be in the group.
+       if ! has_version sys-auth/pambase[consolekit]; then
+                       ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+                       ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+       fi
+       ewarn "If you upgrade from earlier versions, then be sure to check"
+       ewarn "your connection settings.  New versions parse old settings"
+       ewarn "differently, so your DHCP hostname and passphrase could appear"
+       ewarn "enclosed in ['square brackets in quotes']. In this case just"
+       ewarn "remove the offending brackets and quotes."
+}

diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
index 6f6e1d1a6fc0b2f3322348b41486e6d5290f82cc..71504de86da9a99a62279e161b0339a6113ecb3d 100644 (file)
--- a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210.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_pre20111210.ebuild,v 1.3 2011/12/11 10:21:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild,v 1.4 2011/12/30 09:42:08 tomka Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PV}"
 
 DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~tomka/files/${PF}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"