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

Gentoo Archives: gentoo-commits

From: "Daniel Pielmeier (billie)" <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/conky: metadata.xml ChangeLog conky-1.7.2_rc2.ebuild conky-1.7.1.1-r2.ebuild conky-1.7.0_rc1.ebuild conky-1.7.1.1.ebuild conky-1.7.1.1-r1.ebuild
Date: Thu, 30 Jul 2009 20:50:40
Message-Id: E1MWcaD-0001eB-Tp@stork.gentoo.org
1 billie 09/07/30 20:50:37
2
3 Modified: metadata.xml ChangeLog
4 Added: conky-1.7.2_rc2.ebuild conky-1.7.1.1-r2.ebuild
5 Removed: conky-1.7.0_rc1.ebuild conky-1.7.1.1.ebuild
6 conky-1.7.1.1-r1.ebuild
7 Log:
8 Version bump. Remove old.
9 (Portage version: 2.1.6.13/cvs/Linux i686)
10
11 Revision Changes Path
12 1.11 app-admin/conky/metadata.xml
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/metadata.xml?rev=1.11&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/metadata.xml?rev=1.11&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/metadata.xml?r1=1.10&r2=1.11
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/metadata.xml,v
21 retrieving revision 1.10
22 retrieving revision 1.11
23 diff -u -r1.10 -r1.11
24 --- metadata.xml 14 Jul 2009 20:39:42 -0000 1.10
25 +++ metadata.xml 30 Jul 2009 20:50:37 -0000 1.11
26 @@ -25,6 +25,10 @@
27 <flag name='audacious'>enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
28 <flag name='bmpx'>enable monitoring of music played by <pkg>media-sound/bmpx</pkg></flag>
29 <flag name='ipv6'>disable support for tcp (ip4) port monitoring</flag>
30 + <flag name='iostats'>enable support for per-task I/O statistics</flag>
31 + <flag name='lua'>enable if you want Lua scripting support</flag>
32 + <flag name='lua-cairo'>enable if you want Lua Cairo bindings for Conky (also anables lua support)</flag>
33 + <flag name='lua-imlib'>enable if you want Lua Imlib2 bindings for Conky (also enables lua and imlib support)</flag>
34 <flag name='math'>enable support for glibc's libm math library</flag>
35 <flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
36 <flag name='mpd'>enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
37 @@ -33,5 +37,7 @@
38 <flag name='portmon'>enable support for tcp (ip4) port monitoring</flag>
39 <flag name='smapi'>enable support for smapi</flag>
40 <flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag>
41 + <flag name='weather-metar'>enable support for metar weather service</flag>
42 + <flag name='weather-xoap'>enable support for metar and xoap weather service</flag>
43 </use>
44 </pkgmetadata>
45
46
47
48 1.116 app-admin/conky/ChangeLog
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?rev=1.116&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?rev=1.116&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?r1=1.115&r2=1.116
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v
57 retrieving revision 1.115
58 retrieving revision 1.116
59 diff -u -r1.115 -r1.116
60 --- ChangeLog 19 Jul 2009 20:33:10 -0000 1.115
61 +++ ChangeLog 30 Jul 2009 20:50:37 -0000 1.116
62 @@ -1,6 +1,14 @@
63 # ChangeLog for app-admin/conky
64 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.115 2009/07/19 20:33:10 wired Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.116 2009/07/30 20:50:37 billie Exp $
67 +
68 +*conky-1.7.2_rc2 (30 Jul 2009)
69 +*conky-1.7.1.1-r2 (30 Jul 2009)
70 +
71 + 30 Jul 2009; Pielmeier Daniel <billie@g.o> -conky-1.7.0_rc1.ebuild,
72 + -conky-1.7.1.1.ebuild, -conky-1.7.1.1-r1.ebuild, +conky-1.7.1.1-r2.ebuild,
73 + +conky-1.7.2_rc2.ebuild, metadata.xml:
74 + Version bump. Remove old.
75
76 *conky-1.7.1.1-r1 (19 Jul 2009)
77
78
79
80
81 1.1 app-admin/conky/conky-1.7.2_rc2.ebuild
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.2_rc2.ebuild?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.2_rc2.ebuild?rev=1.1&content-type=text/plain
85
86 Index: conky-1.7.2_rc2.ebuild
87 ===================================================================
88 # Copyright 1999-2009 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 # $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2_rc2.ebuild,v 1.1 2009/07/30 20:50:37 billie Exp $
91
92 EAPI="2"
93
94 inherit eutils
95
96 DESCRIPTION="An advanced, highly configurable system monitor for X"
97 HOMEPAGE="http://conky.sourceforge.net/"
98 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
99
100 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
101 SLOT="0"
102 KEYWORDS="~amd64 ~ppc ~x86"
103 IUSE="alsa apcupsd audacious debug hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
104 # currently removed openmp
105
106 DEPEND_COMMON="
107 X? (
108 imlib? ( media-libs/imlib2 )
109 lua-cairo? ( >=dev-lang/toluapp-1.0.93 x11-libs/cairo[X] )
110 lua-imlib? ( >=dev-lang/toluapp-1.0.93 media-libs/imlib2 )
111 nvidia? ( media-video/nvidia-settings )
112 truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
113 x11-libs/libX11
114 x11-libs/libXdamage
115 x11-libs/libXext
116 )
117 alsa? ( media-libs/alsa-lib )
118 audacious? ( >=media-sound/audacious-1.5 )
119 portmon? ( dev-libs/glib )
120 lua? ( >=dev-lang/lua-5.1 )
121 rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
122 wifi? ( net-wireless/wireless-tools )
123 weather-metar? ( net-misc/curl )
124 weather-xoap? ( dev-libs/libxml2 net-misc/curl )
125 "
126 # openmp? ( >=sys-devel/gcc-4.3[openmp] )
127 RDEPEND="
128 ${DEPEND_COMMON}
129 apcupsd? ( sys-power/apcupsd )
130 hddtemp? ( app-admin/hddtemp )
131 moc? ( media-sound/moc )
132 nano-syntax? ( app-editors/nano )
133 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
134 "
135 DEPEND="
136 ${DEPEND_COMMON}
137 dev-util/pkgconfig
138 "
139
140 src_configure() {
141 local myconf
142 if use X; then
143 myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
144 myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
145 else
146 myconf="--disable-x11 --disable-own-window"
147 fi
148
149 econf \
150 ${myconf} \
151 $(use_enable alsa) \
152 $(use_enable apcupsd) \
153 $(use_enable audacious) \
154 $(use_enable debug) \
155 $(use_enable hddtemp) \
156 $(use_enable imlib imlib2) \
157 $(use_enable iostats) \
158 $(use_enable lua) \
159 $(use_enable lua-cairo) \
160 $(use_enable lua-imlib lua-imlib2) \
161 $(use_enable thinkpad ibm) \
162 $(use_enable math) \
163 $(use_enable moc) \
164 $(use_enable mpd) \
165 $(use_enable nvidia) \
166 $(use_enable portmon) \
167 $(use_enable rss) \
168 $(use_enable weather-metar) \
169 $(use_enable weather-xoap) \
170 $(use_enable wifi wlan)
171 # $(use_enable openmp) \
172 }
173
174 src_install() {
175 emake DESTDIR="${D}" install || die "make install failed"
176 dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
177 dohtml doc/docs.html doc/config_settings.html doc/variables.html \
178 || die "dohtml failed"
179
180 if use vim-syntax; then
181 insinto /usr/share/vim/vimfiles/ftdetect
182 doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
183
184 insinto /usr/share/vim/vimfiles/syntax
185 doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
186 fi
187
188 if use nano-syntax; then
189 insinto /usr/share/nano/
190 doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
191 fi
192 }
193
194 pkg_postinst() {
195 elog "You can find a sample configuration file at"
196 elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
197 elog "it to ~/.conkyrc and edit it to your liking."
198 elog
199 elog "For more info on Conky's new features please look at"
200 elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
201 elog "There are also pretty html docs available"
202 elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html"
203 elog
204 elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
205 elog
206 elog "Vim syntax highlighting for conkyrc now enabled with"
207 elog "USE=vim-syntax, for Nano with USE=nano-syntax"
208 elog
209 }
210
211
212
213 1.1 app-admin/conky/conky-1.7.1.1-r2.ebuild
214
215 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.1.1-r2.ebuild?rev=1.1&view=markup
216 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.1.1-r2.ebuild?rev=1.1&content-type=text/plain
217
218 Index: conky-1.7.1.1-r2.ebuild
219 ===================================================================
220 # Copyright 1999-2009 Gentoo Foundation
221 # Distributed under the terms of the GNU General Public License v2
222 # $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.1.1-r2.ebuild,v 1.1 2009/07/30 20:50:37 billie Exp $
223
224 EAPI="2"
225
226 inherit eutils
227
228 DESCRIPTION="An advanced, highly configurable system monitor for X"
229 HOMEPAGE="http://conky.sourceforge.net/"
230 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
231
232 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
233 SLOT="0"
234 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
235 IUSE="alsa apcupsd audacious bmpx debug hddtemp imlib lua math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax wifi X"
236 # currently removed openmp
237
238 DEPEND_COMMON="
239 X? (
240 x11-libs/libX11
241 x11-libs/libXdamage
242 x11-libs/libXext
243 truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
244 imlib? ( media-libs/imlib2 )
245 nvidia? ( media-video/nvidia-settings )
246 )
247 alsa? ( media-libs/alsa-lib )
248 audacious? ( >=media-sound/audacious-1.5 )
249 bmpx? ( media-sound/bmpx >=sys-apps/dbus-0.35 )
250 portmon? ( dev-libs/glib )
251 lua? ( >=dev-lang/lua-5.1 )
252 rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
253 wifi? ( net-wireless/wireless-tools )
254 "
255 # openmp? ( >=sys-devel/gcc-4.3[openmp] )
256 RDEPEND="
257 ${DEPEND_COMMON}
258 apcupsd? ( sys-power/apcupsd )
259 hddtemp? ( app-admin/hddtemp )
260 moc? ( media-sound/moc )
261 nano-syntax? ( app-editors/nano )
262 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
263 "
264 DEPEND="
265 ${DEPEND_COMMON}
266 dev-util/pkgconfig
267 "
268
269 src_prepare() {
270 cp "${FILESDIR}"/conky_no_x11.conf data/
271 epatch "${FILESDIR}"/"${P}"-comment.patch
272 }
273
274 src_configure() {
275 local myconf
276 if use X; then
277 myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
278 myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
279 else
280 myconf="--disable-x11 --disable-own-window"
281 fi
282
283 econf \
284 ${myconf} \
285 $(use_enable alsa) \
286 $(use_enable apcupsd) \
287 $(use_enable audacious) \
288 $(use_enable bmpx) \
289 $(use_enable debug) \
290 $(use_enable hddtemp) \
291 $(use_enable imlib imlib2) \
292 $(use_enable lua) \
293 $(use_enable thinkpad ibm) \
294 $(use_enable math) \
295 $(use_enable moc) \
296 $(use_enable mpd) \
297 $(use_enable nvidia) \
298 $(use_enable rss) \
299 $(use_enable wifi wlan) \
300 $(use_enable portmon)
301 # $(use_enable openmp) \
302 }
303
304 src_install() {
305 emake DESTDIR="${D}" install || die "make install failed"
306 dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
307 dohtml doc/docs.html doc/config_settings.html doc/variables.html \
308 || die "dohtml failed"
309
310 if use vim-syntax; then
311 insinto /usr/share/vim/vimfiles/ftdetect
312 doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
313
314 insinto /usr/share/vim/vimfiles/syntax
315 doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
316 fi
317
318 if use nano-syntax; then
319 insinto /usr/share/nano/
320 doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
321 fi
322 }
323
324 pkg_postinst() {
325 elog "You can find a sample configuration file at"
326 elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
327 elog "it to ~/.conkyrc and edit it to your liking."
328 elog
329 elog "For more info on Conky's new features please look at"
330 elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
331 elog "There are also pretty html docs available"
332 elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html"
333 elog
334 elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
335 elog
336 elog "Vim syntax highlighting for conkyrc now enabled with"
337 elog "USE=vim-syntax, for Nano with USE=nano-syntax"
338 elog
339 }
Report Message
Find on MARC Find on Google Groups