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: ChangeLog conky-1.6.1.ebuild conky-1.7.2-r2.ebuild conky-1.8.0_rc2.ebuild conky-1.7.1.1-r2.ebuild
Date: Mon, 25 Jan 2010 18:14:28
Message-Id: E1NZTSC-00055l-AZ@stork.gentoo.org
1 billie 10/01/25 18:14:24
2
3 Modified: ChangeLog conky-1.6.1.ebuild conky-1.7.2-r2.ebuild
4 Added: conky-1.8.0_rc2.ebuild
5 Removed: conky-1.7.1.1-r2.ebuild
6 Log:
7 Version bump. Remove old.
8 (Portage version: 2.1.6.13/cvs/Linux i686)
9
10 Revision Changes Path
11 1.126 app-admin/conky/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?rev=1.126&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?rev=1.126&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/ChangeLog?r1=1.125&r2=1.126
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v
20 retrieving revision 1.125
21 retrieving revision 1.126
22 diff -u -r1.125 -r1.126
23 --- ChangeLog 31 Dec 2009 14:05:02 -0000 1.125
24 +++ ChangeLog 25 Jan 2010 18:14:23 -0000 1.126
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-admin/conky
27 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.125 2009/12/31 14:05:02 ranger Exp $
29 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.126 2010/01/25 18:14:23 billie Exp $
31 +
32 +*conky-1.8.0_rc2 (25 Jan 2010)
33 +
34 + 25 Jan 2010; Daniel Pielmeier <billie@g.o>
35 + -conky-1.7.1.1-r2.ebuild, +conky-1.8.0_rc2.ebuild:
36 + Version bump. Remove old.
37
38 31 Dec 2009; Brent Baude <ranger@g.o> conky-1.7.2-r2.ebuild:
39 Marking conky-1.7.2-r2 ~ppc64 for bug 274847
40
41
42
43 1.15 app-admin/conky/conky-1.6.1.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild?rev=1.15&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild?rev=1.15&content-type=text/plain
47 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild?r1=1.14&r2=1.15
48
49 Index: conky-1.6.1.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v
52 retrieving revision 1.14
53 retrieving revision 1.15
54 diff -u -r1.14 -r1.15
55 --- conky-1.6.1.ebuild 31 Jul 2009 15:58:19 -0000 1.14
56 +++ conky-1.6.1.ebuild 25 Jan 2010 18:14:23 -0000 1.15
57 @@ -1,6 +1,6 @@
58 -# Copyright 1999-2009 Gentoo Foundation
59 +# Copyright 1999-2010 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.14 2009/07/31 15:58:19 ssuominen Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.15 2010/01/25 18:14:23 billie Exp $
63
64 EAPI="2"
65
66
67
68
69 1.6 app-admin/conky/conky-1.7.2-r2.ebuild
70
71 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild?rev=1.6&view=markup
72 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild?rev=1.6&content-type=text/plain
73 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild?r1=1.5&r2=1.6
74
75 Index: conky-1.7.2-r2.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild,v
78 retrieving revision 1.5
79 retrieving revision 1.6
80 diff -u -r1.5 -r1.6
81 --- conky-1.7.2-r2.ebuild 31 Dec 2009 14:05:02 -0000 1.5
82 +++ conky-1.7.2-r2.ebuild 25 Jan 2010 18:14:23 -0000 1.6
83 @@ -1,6 +1,6 @@
84 -# Copyright 1999-2009 Gentoo Foundation
85 +# Copyright 1999-2010 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild,v 1.5 2009/12/31 14:05:02 ranger Exp $
88 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild,v 1.6 2010/01/25 18:14:23 billie Exp $
89
90 EAPI="2"
91
92
93
94
95 1.1 app-admin/conky/conky-1.8.0_rc2.ebuild
96
97 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.8.0_rc2.ebuild?rev=1.1&view=markup
98 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conky/conky-1.8.0_rc2.ebuild?rev=1.1&content-type=text/plain
99
100 Index: conky-1.8.0_rc2.ebuild
101 ===================================================================
102 # Copyright 1999-2010 Gentoo Foundation
103 # Distributed under the terms of the GNU General Public License v2
104 # $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0_rc2.ebuild,v 1.1 2010/01/25 18:14:23 billie Exp $
105
106 EAPI="2"
107
108 DESCRIPTION="An advanced, highly configurable system monitor for X"
109 HOMEPAGE="http://conky.sourceforge.net/"
110 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
111
112 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
113 SLOT="0"
114 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
115 IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
116
117 DEPEND_COMMON="
118 X? (
119 imlib? ( media-libs/imlib2 )
120 lua-cairo? ( >=dev-lang/toluapp-1.0.93 x11-libs/cairo[X] )
121 lua-imlib? ( >=dev-lang/toluapp-1.0.93 media-libs/imlib2 )
122 nvidia? ( media-video/nvidia-settings )
123 truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
124 x11-libs/libX11
125 x11-libs/libXdamage
126 x11-libs/libXext
127 )
128 audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
129 curl? ( net-misc/curl )
130 eve? ( net-misc/curl dev-libs/libxml2 )
131 portmon? ( dev-libs/glib )
132 lua? ( >=dev-lang/lua-5.1 )
133 ncurses? ( sys-libs/ncurses )
134 rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
135 wifi? ( net-wireless/wireless-tools )
136 weather-metar? ( net-misc/curl )
137 weather-xoap? ( dev-libs/libxml2 net-misc/curl )
138 virtual/libiconv
139 "
140 RDEPEND="
141 ${DEPEND_COMMON}
142 apcupsd? ( sys-power/apcupsd )
143 hddtemp? ( app-admin/hddtemp )
144 moc? ( media-sound/moc )
145 nano-syntax? ( app-editors/nano )
146 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
147 "
148 DEPEND="
149 ${DEPEND_COMMON}
150 dev-util/pkgconfig
151 "
152
153 src_configure() {
154 local myconf
155 if use X; then
156 myconf="--enable-x11 --enable-double-buffer --enable-xdamage --enable-argb"
157 myconf="${myconf} --enable-own-window"
158 myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
159 myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
160 myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
161 else
162 myconf="--disable-x11 --disable-own-window --disable-argb"
163 myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
164 myconf="${myconf} --disable-nvidia --disable-xft"
165 fi
166
167 econf \
168 ${myconf} \
169 $(use_enable apcupsd) \
170 $(use_enable audacious) \
171 $(use_enable curl) \
172 $(use_enable debug) \
173 $(use_enable eve) \
174 $(use_enable hddtemp) \
175 $(use_enable iostats) \
176 $(use_enable lua) \
177 $(use_enable thinkpad ibm) \
178 $(use_enable math) \
179 $(use_enable moc) \
180 $(use_enable mpd) \
181 $(use_enable ncurses) \
182 $(use_enable portmon) \
183 $(use_enable rss) \
184 $(use_enable weather-metar) \
185 $(use_enable weather-xoap) \
186 $(use_enable wifi wlan)
187 }
188
189 src_install() {
190 emake DESTDIR="${D}" install || die "make install failed"
191 dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
192 dohtml doc/docs.html doc/config_settings.html doc/variables.html \
193 || die "dohtml failed"
194
195 if use vim-syntax; then
196 insinto /usr/share/vim/vimfiles/ftdetect
197 doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
198
199 insinto /usr/share/vim/vimfiles/syntax
200 doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
201 fi
202
203 if use nano-syntax; then
204 insinto /usr/share/nano/
205 doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
206 fi
207 }
208
209 pkg_postinst() {
210 elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
211 elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
212 elog
213 elog "For more info on Conky's features please look at the Changelog in"
214 elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
215 elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
216 elog
217 elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
218 elog
219 }
Report Message
Find on MARC Find on Google Groups