Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Thomas Kahle (tomka)" <tomka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/wicd: wicd-1.7.0-r1.ebuild wicd-1.7.1_beta2-r4.ebuild wicd-1.7.1_beta2-r3.ebuild wicd-1.7.0.ebuild ChangeLog wicd-1.7.1_beta2-r7.ebuild wicd-1.7.1_beta2-r6.ebuild
Date: Sat, 01 Oct 2011 16:18:38
Message-Id: 20111001161828.461002004B@flycatcher.gentoo.org
1 tomka 11/10/01 16:18:28
2
3 Modified: wicd-1.7.0-r1.ebuild wicd-1.7.1_beta2-r4.ebuild
4 wicd-1.7.1_beta2-r3.ebuild wicd-1.7.0.ebuild
5 ChangeLog wicd-1.7.1_beta2-r6.ebuild
6 Added: wicd-1.7.1_beta2-r7.ebuild
7 Log:
8 Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761)
9
10 (Portage version: 2.1.10.20/cvs/Linux i686)
11
12 Revision Changes Path
13 1.4 net-misc/wicd/wicd-1.7.0-r1.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild?rev=1.4&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild?rev=1.4&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild?r1=1.3&r2=1.4
18
19 Index: wicd-1.7.0-r1.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v
22 retrieving revision 1.3
23 retrieving revision 1.4
24 diff -u -r1.3 -r1.4
25 --- wicd-1.7.0-r1.ebuild 19 Mar 2011 08:23:54 -0000 1.3
26 +++ wicd-1.7.0-r1.ebuild 1 Oct 2011 16:18:28 -0000 1.4
27 @@ -1,6 +1,6 @@
28 # Copyright 1999-2011 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.3 2011/03/19 08:23:54 tomka Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.4 2011/10/01 16:18:28 tomka Exp $
32
33 EAPI=3
34
35 @@ -50,6 +50,7 @@
36 libnotify? ( dev-python/notify-python )
37 ncurses? (
38 >=dev-python/urwid-0.9.9.1
39 + <dev-python/urwid-1.0.0
40 dev-python/pygobject
41 )
42 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
43
44
45
46 1.7 net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild?rev=1.7&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild?rev=1.7&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild?r1=1.6&r2=1.7
51
52 Index: wicd-1.7.1_beta2-r4.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v
55 retrieving revision 1.6
56 retrieving revision 1.7
57 diff -u -r1.6 -r1.7
58 --- wicd-1.7.1_beta2-r4.ebuild 17 Jul 2011 19:55:00 -0000 1.6
59 +++ wicd-1.7.1_beta2-r4.ebuild 1 Oct 2011 16:18:28 -0000 1.7
60 @@ -1,6 +1,6 @@
61 # Copyright 1999-2011 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v 1.6 2011/07/17 19:55:00 halcy0n Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v 1.7 2011/10/01 16:18:28 tomka Exp $
65
66 EAPI=3
67
68 @@ -54,6 +54,7 @@
69 libnotify? ( dev-python/notify-python )
70 ncurses? (
71 >=dev-python/urwid-0.9.9.1
72 + <dev-python/urwid-1.0.0
73 dev-python/pygobject
74 )
75 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
76
77
78
79 1.5 net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild?rev=1.5&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild?rev=1.5&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild?r1=1.4&r2=1.5
84
85 Index: wicd-1.7.1_beta2-r3.ebuild
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v
88 retrieving revision 1.4
89 retrieving revision 1.5
90 diff -u -r1.4 -r1.5
91 --- wicd-1.7.1_beta2-r3.ebuild 29 May 2011 10:55:34 -0000 1.4
92 +++ wicd-1.7.1_beta2-r3.ebuild 1 Oct 2011 16:18:28 -0000 1.5
93 @@ -1,6 +1,6 @@
94 # Copyright 1999-2011 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.4 2011/05/29 10:55:34 xarthisius Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.5 2011/10/01 16:18:28 tomka Exp $
98
99 EAPI=3
100
101 @@ -54,6 +54,7 @@
102 libnotify? ( dev-python/notify-python )
103 ncurses? (
104 >=dev-python/urwid-0.9.9.1
105 + <dev-python/urwid-1.0.0
106 dev-python/pygobject
107 )
108 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
109
110
111
112 1.11 net-misc/wicd/wicd-1.7.0.ebuild
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild?rev=1.11&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild?rev=1.11&content-type=text/plain
116 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild?r1=1.10&r2=1.11
117
118 Index: wicd-1.7.0.ebuild
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v
121 retrieving revision 1.10
122 retrieving revision 1.11
123 diff -u -r1.10 -r1.11
124 --- wicd-1.7.0.ebuild 10 Apr 2011 21:42:27 -0000 1.10
125 +++ wicd-1.7.0.ebuild 1 Oct 2011 16:18:28 -0000 1.11
126 @@ -1,6 +1,6 @@
127 # Copyright 1999-2011 Gentoo Foundation
128 # Distributed under the terms of the GNU General Public License v2
129 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.10 2011/04/10 21:42:27 arfrever Exp $
130 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.11 2011/10/01 16:18:28 tomka Exp $
131
132 EAPI=3
133
134 @@ -45,6 +45,7 @@
135 libnotify? ( dev-python/notify-python )
136 ncurses? (
137 >=dev-python/urwid-0.9.9.1
138 + <dev-python/urwid-1.0.0
139 dev-python/pygobject
140 )
141 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
142
143
144
145 1.95 net-misc/wicd/ChangeLog
146
147 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/ChangeLog?rev=1.95&view=markup
148 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/ChangeLog?rev=1.95&content-type=text/plain
149 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/ChangeLog?r1=1.94&r2=1.95
150
151 Index: ChangeLog
152 ===================================================================
153 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v
154 retrieving revision 1.94
155 retrieving revision 1.95
156 diff -u -r1.94 -r1.95
157 --- ChangeLog 13 Sep 2011 19:25:14 -0000 1.94
158 +++ ChangeLog 1 Oct 2011 16:18:28 -0000 1.95
159 @@ -1,6 +1,14 @@
160 # ChangeLog for net-misc/wicd
161 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
162 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.94 2011/09/13 19:25:14 tomka Exp $
163 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.95 2011/10/01 16:18:28 tomka Exp $
164 +
165 +*wicd-1.7.1_beta2-r7 (01 Oct 2011)
166 +
167 + 01 Oct 2011; Thomas Kahle <tomka@g.o> wicd-1.7.0.ebuild,
168 + wicd-1.7.0-r1.ebuild, wicd-1.7.1_beta2-r3.ebuild, wicd-1.7.1_beta2-r4.ebuild,
169 + wicd-1.7.1_beta2-r6.ebuild, +wicd-1.7.1_beta2-r7.ebuild,
170 + +files/wicd-1.7.1_beta2-urwid-1.0.patch:
171 + Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761)
172
173 *wicd-1.7.1_beta2-r6 (13 Sep 2011)
174
175
176
177
178 1.2 net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
179
180 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild?rev=1.2&view=markup
181 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild?rev=1.2&content-type=text/plain
182 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild?r1=1.1&r2=1.2
183
184 Index: wicd-1.7.1_beta2-r6.ebuild
185 ===================================================================
186 RCS file: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v
187 retrieving revision 1.1
188 retrieving revision 1.2
189 diff -u -r1.1 -r1.2
190 --- wicd-1.7.1_beta2-r6.ebuild 13 Sep 2011 19:25:14 -0000 1.1
191 +++ wicd-1.7.1_beta2-r6.ebuild 1 Oct 2011 16:18:28 -0000 1.2
192 @@ -1,6 +1,6 @@
193 # Copyright 1999-2011 Gentoo Foundation
194 # Distributed under the terms of the GNU General Public License v2
195 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.1 2011/09/13 19:25:14 tomka Exp $
196 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.2 2011/10/01 16:18:28 tomka Exp $
197
198 EAPI=3
199
200 @@ -54,6 +54,7 @@
201 libnotify? ( dev-python/notify-python )
202 ncurses? (
203 >=dev-python/urwid-0.9.9.1
204 + <dev-python/urwid-1.0.0
205 dev-python/pygobject
206 )
207 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
208
209
210
211 1.1 net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
212
213 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild?rev=1.1&view=markup
214 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild?rev=1.1&content-type=text/plain
215
216 Index: wicd-1.7.1_beta2-r7.ebuild
217 ===================================================================
218 # Copyright 1999-2011 Gentoo Foundation
219 # Distributed under the terms of the GNU General Public License v2
220 # $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild,v 1.1 2011/10/01 16:18:28 tomka Exp $
221
222 EAPI=3
223
224 PYTHON_DEPEND="2"
225 PYTHON_USE_WITH="ncurses? xml"
226 SUPPORT_PYTHON_ABIS="1"
227 RESTRICT_PYTHON_ABIS="3.* *-jython"
228 DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
229
230 inherit eutils distutils
231
232 MY_P=${P/_beta/b}
233 S="${WORKDIR}/${MY_P}"
234
235 DESCRIPTION="A lightweight wired and wireless network manager for Linux"
236 HOMEPAGE="http://wicd.sourceforge.net/"
237 SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
238
239 LICENSE="GPL-2"
240 SLOT="0"
241 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
242 IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
243
244 DEPEND=""
245 # Maybe virtual/dhcp would work, but there are enough problems with
246 # net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
247 # first if none are installed.
248 RDEPEND="
249 dev-python/dbus-python
250 X? ( gtk? ( dev-python/pygtk
251 || (
252 x11-misc/ktsuss
253 x11-libs/gksu
254 kde-base/kdesu
255 )
256 )
257 )
258 || (
259 net-misc/dhcpcd
260 net-misc/dhcp
261 net-misc/pump
262 )
263 net-wireless/wireless-tools
264 net-wireless/wpa_supplicant
265 || (
266 sys-apps/net-tools
267 sys-apps/ethtool
268 )
269 !gtk? ( dev-python/pygobject )
270 ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
271 libnotify? ( dev-python/notify-python )
272 ncurses? (
273 >=dev-python/urwid-1.0.0
274 dev-python/pygobject
275 )
276 pm-utils? ( >=sys-power/pm-utils-1.1.1 )
277 "
278 DOCS="CHANGES NEWS AUTHORS README"
279
280 src_prepare() {
281 epatch "${FILESDIR}"/${P}-init.patch
282 # Fix urwid calls
283 epatch "${FILESDIR}/${P}"-urwid-1.0.patch
284 epatch "${FILESDIR}"/${PN}-init-sve-start.patch
285 # Fix ad-hoc networking (bug 351337)
286 epatch "${FILESDIR}"/fix-ad-hoc-networking.patch
287 # Add a template for hex psk's and wpa (Bug 306423)
288 epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch
289 # get rid of opts variable to fix bug 381885
290 sed -i "/opts/d" "in/init=gentoo=wicd.in"
291 # Need to ensure that generated scripts use Python 2 at run time.
292 sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
293 -i setup.py || die "sed failed"
294 python_copy_sources
295 }
296
297 src_configure() {
298 local myconf
299 use gtk || myconf="${myconf} --no-install-gtk"
300 use libnotify || myconf="${myconf} --no-use-notifications"
301 use ncurses || myconf="${myconf} --no-install-ncurses"
302 use pm-utils || myconf="${myconf} --no-install-pmutils"
303 configuration() {
304 $(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
305 }
306 python_execute_function -s configuration
307 }
308
309 src_install() {
310 distutils_src_install
311 keepdir /var/lib/wicd/configurations \
312 || die "keepdir failed, critical for this app"
313 keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
314 || die "keepdir failed, critical for this app"
315 keepdir /var/log/wicd \
316 || die "keepdir failed, critical for this app"
317 use nls || rm -rf "${D}"/usr/share/locale
318 }
319
320 pkg_postinst() {
321 distutils_pkg_postinst
322
323 elog "You may need to restart the dbus service after upgrading wicd."
324 echo
325 elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
326 elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
327 elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
328 elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
329 # Maintainer's note: the consolekit use flag short circuits a dbus rule and
330 # allows the connection. Else, you need to be in the group.
331 if ! has_version sys-auth/pambase[consolekit]; then
332 ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
333 ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
334 fi
335 }
Report Message
Find on MARC Find on Google Groups