1 |
commit: 927765d9bc6d359f7dfe130a3c55c4721938e0ea |
2 |
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 28 14:27:40 2015 +0000 |
4 |
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 28 14:27:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927765d9 |
7 |
|
8 |
app-admin/conky: Version bump. |
9 |
|
10 |
Fixes bug 557500. Thanks to Aaron W. Swenson for the report. |
11 |
|
12 |
Package-Manager: portage-2.2.20.1 |
13 |
|
14 |
app-admin/conky/Manifest | 1 + |
15 |
app-admin/conky/conky-1.10.0.ebuild | 178 +++++++++++++++++++++++++ |
16 |
app-admin/conky/files/conky-1.10.0-cmake.patch | 11 ++ |
17 |
app-admin/conky/metadata.xml | 9 +- |
18 |
4 files changed, 197 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest |
21 |
index bf4df4e..e064cbf 100644 |
22 |
--- a/app-admin/conky/Manifest |
23 |
+++ b/app-admin/conky/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
+DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46 |
26 |
DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a |
27 |
|
28 |
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..d6660ea |
31 |
--- /dev/null |
32 |
+++ b/app-admin/conky/conky-1.10.0.ebuild |
33 |
@@ -0,0 +1,178 @@ |
34 |
+# Copyright 1999-2015 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI=5 |
39 |
+ |
40 |
+inherit autotools eutils libtool cmake-utils linux-info |
41 |
+ |
42 |
+DESCRIPTION="An advanced, highly configurable system monitor for X" |
43 |
+HOMEPAGE="https://github.com/brndnmtthws/conky" |
44 |
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+ |
46 |
+LICENSE="GPL-3 BSD LGPL-2.1 MIT" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~ppc ~x86" |
49 |
+IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats |
50 |
+ ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax |
51 |
+ ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar |
52 |
+ weather-xoap webserver wifi X xmms2" |
53 |
+ |
54 |
+DEPEND_COMMON=" |
55 |
+ X? ( |
56 |
+ imlib? ( media-libs/imlib2[X] ) |
57 |
+ lua-cairo? ( |
58 |
+ >=dev-lua/toluapp-1.0.93 |
59 |
+ x11-libs/cairo[X] ) |
60 |
+ lua-imlib? ( |
61 |
+ >=dev-lua/toluapp-1.0.93 |
62 |
+ media-libs/imlib2[X] ) |
63 |
+ lua-rsvg? ( |
64 |
+ >=dev-lua/toluapp-1.0.93 |
65 |
+ gnome-base/librsvg ) |
66 |
+ nvidia? ( media-video/nvidia-settings ) |
67 |
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) |
68 |
+ x11-libs/libX11 |
69 |
+ x11-libs/libXdamage |
70 |
+ x11-libs/libXfixes |
71 |
+ x11-libs/libXext |
72 |
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) |
73 |
+ xmms2? ( media-sound/xmms2 ) |
74 |
+ ) |
75 |
+ cmus? ( media-sound/cmus ) |
76 |
+ curl? ( net-misc/curl ) |
77 |
+ eve? ( net-misc/curl dev-libs/libxml2 ) |
78 |
+ ical? ( dev-libs/libical ) |
79 |
+ iconv? ( virtual/libiconv ) |
80 |
+ irc? ( net-libs/libircclient ) |
81 |
+ mysql? ( >=virtual/mysql-5.0 ) |
82 |
+ ncurses? ( sys-libs/ncurses:= ) |
83 |
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) |
84 |
+ wifi? ( net-wireless/wireless-tools ) |
85 |
+ weather-metar? ( net-misc/curl ) |
86 |
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl ) |
87 |
+ webserver? ( net-libs/libmicrohttpd ) |
88 |
+ >=dev-lang/lua-5.1.4-r8:0 |
89 |
+ " |
90 |
+RDEPEND=" |
91 |
+ ${DEPEND_COMMON} |
92 |
+ apcupsd? ( sys-power/apcupsd ) |
93 |
+ hddtemp? ( app-admin/hddtemp ) |
94 |
+ moc? ( media-sound/moc ) |
95 |
+ nano-syntax? ( app-editors/nano ) |
96 |
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) |
97 |
+ " |
98 |
+DEPEND=" |
99 |
+ ${DEPEND_COMMON} |
100 |
+ " |
101 |
+ |
102 |
+CONFIG_CHECK=IPV6 |
103 |
+ |
104 |
+DOCS=( README TODO ChangeLog NEWS AUTHORS ) |
105 |
+ |
106 |
+pkg_setup() { |
107 |
+ use ipv6 && linux-info_pkg_setup |
108 |
+} |
109 |
+ |
110 |
+src_prepare() { |
111 |
+ epatch "${FILESDIR}/${P}-cmake.patch" |
112 |
+ |
113 |
+ # Allow user patches #478482 |
114 |
+ # Only run autotools if user patched something |
115 |
+ epatch_user && eautoreconf || elibtoolize |
116 |
+} |
117 |
+ |
118 |
+src_configure() { |
119 |
+ local mycmakeargs |
120 |
+ |
121 |
+ if use X; then |
122 |
+ mycmakeargs="-DBUILD_X11=ON" |
123 |
+ mycmakeargs="${mycmakeargs} -DOWN_WINDOW=ON" |
124 |
+ mycmakeargs="${mycmakeargs} -DBUILD_XDAMAGE=ON" |
125 |
+ mycmakeargs="${mycmakeargs} -DBUILD_XDBE=ON" |
126 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build truetype XFT)" |
127 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build imlib IMLIB2)" |
128 |
+ mycmakeargs="${mycmakeargs} -DBUILD_XSHAPE=ON" |
129 |
+ mycmakeargs="${mycmakeargs} -DBUILD_ARGB=ON" |
130 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-cairo LUA_CAIRO)" |
131 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-imlib LUA_IMLIB2)" |
132 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-rsvg LUA_RSVG)" |
133 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build nvidia)" |
134 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build audacious)" |
135 |
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build xmms2)" |
136 |
+ else |
137 |
+ mycmakeargs="-DBUILD_X11=OFF" |
138 |
+ mycmakeargs="${mycmakeargs} -DBUILD_NVIDIA=OFF" |
139 |
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_CAIRO=OFF" |
140 |
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_IMLIB2=OFF" |
141 |
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_RSVG=OFF" |
142 |
+ mycmakeargs="${mycmakeargs} -DBUILD_AUDACIOUS=OFF" |
143 |
+ mycmakeargs="${mycmakeargs} -DBUILD_XMMS2=OFF" |
144 |
+ fi |
145 |
+ |
146 |
+ mycmakeargs="${mycmakeargs} |
147 |
+ $(cmake-utils_use_build apcupsd) |
148 |
+ $(cmake-utils_use_build debug) |
149 |
+ $(cmake-utils_use_build cmus) |
150 |
+ $(cmake-utils_use_build curl) |
151 |
+ $(cmake-utils_use_build eve) |
152 |
+ $(cmake-utils_use_build hddtemp) |
153 |
+ $(cmake-utils_use_build iostats) |
154 |
+ $(cmake-utils_use_build ical) |
155 |
+ $(cmake-utils_use_build iconv) |
156 |
+ $(cmake-utils_use_build ipv6) |
157 |
+ $(cmake-utils_use_build irc) |
158 |
+ $(cmake-utils_use_build math) |
159 |
+ $(cmake-utils_use_build moc) |
160 |
+ $(cmake-utils_use_build mpd) |
161 |
+ $(cmake-utils_use_build mysql) |
162 |
+ $(cmake-utils_use_build ncurses) |
163 |
+ $(cmake-utils_use_build portmon PORT_MONITORS) |
164 |
+ $(cmake-utils_use_build rss) |
165 |
+ $(cmake-utils_use_build thinkpad IBM) |
166 |
+ $(cmake-utils_use_build weather-metar WEATHER_METAR) |
167 |
+ $(cmake-utils_use_build weather-xoap WEATHER_XOAP) |
168 |
+ $(cmake-utils_use_build webserver HTTP) |
169 |
+ $(cmake-utils_use_build wifi WLAN) |
170 |
+ -DBUILD_BUILTIN_CONFIG=ON |
171 |
+ -DBUILD_OLD_CONFIG=ON |
172 |
+ -DBUILD_I18N=ON |
173 |
+ -DMAINTAINER_MODE=ON |
174 |
+ -DBUILD_AUDACIOUS_LEGACY=OFF |
175 |
+ -DBUILD_BMPX=OFF |
176 |
+ -DDOC_PATH=/usr/share/doc/${PF} |
177 |
+ " |
178 |
+ |
179 |
+ cmake-utils_src_configure |
180 |
+} |
181 |
+ |
182 |
+src_install() { |
183 |
+ cmake-utils_src_install |
184 |
+ |
185 |
+ if use vim-syntax; then |
186 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
187 |
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim |
188 |
+ |
189 |
+ insinto /usr/share/vim/vimfiles/syntax |
190 |
+ doins "${S}"/extras/vim/syntax/conkyrc.vim |
191 |
+ fi |
192 |
+ |
193 |
+ if use nano-syntax; then |
194 |
+ insinto /usr/share/nano/ |
195 |
+ doins "${S}"/extras/nano/conky.nanorc |
196 |
+ fi |
197 |
+} |
198 |
+ |
199 |
+pkg_postinst() { |
200 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
201 |
+ elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}." |
202 |
+ elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf" |
203 |
+ elog "and edit it to your liking." |
204 |
+ elog |
205 |
+ elog "There are pretty html docs available at the conky homepage" |
206 |
+ elog "or in ${ROOT%/}/usr/share/doc/${PF}/html." |
207 |
+ elog |
208 |
+ elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" |
209 |
+ elog |
210 |
+ fi |
211 |
+} |
212 |
|
213 |
diff --git a/app-admin/conky/files/conky-1.10.0-cmake.patch b/app-admin/conky/files/conky-1.10.0-cmake.patch |
214 |
new file mode 100644 |
215 |
index 0000000..4f9d276 |
216 |
--- /dev/null |
217 |
+++ b/app-admin/conky/files/conky-1.10.0-cmake.patch |
218 |
@@ -0,0 +1,11 @@ |
219 |
+--- cmake/Docbook.cmake 2014-06-21 09:51:44.857916287 +0200 |
220 |
++++ cmake/Docbook.cmake.new 2014-06-21 09:53:37.251924303 +0200 |
221 |
+@@ -72,7 +72,7 @@ |
222 |
+ COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html |
223 |
+ |
224 |
+ COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml |
225 |
+- COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR} |
226 |
++ COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --encoding=UTF8 --output-dir ${CMAKE_CURRENT_SOURCE_DIR} |
227 |
+ COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html |
228 |
+ COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README |
229 |
+ COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README |
230 |
|
231 |
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml |
232 |
index 81d6ebe..3a6465d 100644 |
233 |
--- a/app-admin/conky/metadata.xml |
234 |
+++ b/app-admin/conky/metadata.xml |
235 |
@@ -17,11 +17,15 @@ |
236 |
<use> |
237 |
<flag name="apcupsd">enable support for <pkg>sys-power/apcupsd</pkg></flag> |
238 |
<flag name="audacious">enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag> |
239 |
+ <flag name="cmus">enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag> |
240 |
<flag name="eve">enable support for the eve-online skill monitor</flag> |
241 |
+ <flag name="ical">enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag> |
242 |
<flag name="iostats">enable support for per-task I/O statistics</flag> |
243 |
+ <flag name="irc">enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag> |
244 |
<flag name="lua">enable if you want Lua scripting support</flag> |
245 |
- <flag name="lua-cairo">enable if you want Lua Cairo bindings for Conky (also enables lua support)</flag> |
246 |
- <flag name="lua-imlib">enable if you want Lua Imlib2 bindings for Conky (also enables lua and imlib support)</flag> |
247 |
+ <flag name="lua-cairo">enable if you want Lua Cairo bindings</flag> |
248 |
+ <flag name="lua-imlib">enable if you want Lua Imlib2 bindings</flag> |
249 |
+ <flag name="lua-rsvg">enable if you want Lua RSVG bindings</flag> |
250 |
<flag name="math">enable support for glibc's libm math library</flag> |
251 |
<flag name="moc">enable monitoring of music played by <pkg>media-sound/moc</pkg></flag> |
252 |
<flag name="mpd">enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag> |
253 |
@@ -31,6 +35,7 @@ |
254 |
<flag name="thinkpad">enable support for IBM/Lenovo notebooks</flag> |
255 |
<flag name="weather-metar">enable support for metar weather service</flag> |
256 |
<flag name="weather-xoap">enable support for metar and xoap weather service</flag> |
257 |
+ <flag name="webserver">enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag> |
258 |
<flag name="xmms2">enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag> |
259 |
</use> |
260 |
</pkgmetadata> |